[Scummvm-cvs-logs] CVS: scummvm/bs2 resman.cpp,1.29,1.30 logic.cpp,1.8,1.9
Max Horn
fingolfin at users.sourceforge.net
Sat Sep 13 10:37:07 CEST 2003
Update of /cvsroot/scummvm/scummvm/bs2
In directory sc8-pr-cvs1:/tmp/cvs-serv10647
Modified Files:
resman.cpp logic.cpp
Log Message:
convert run lists in the res manager
Index: resman.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/resman.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- resman.cpp 13 Sep 2003 13:02:44 -0000 1.29
+++ resman.cpp 13 Sep 2003 17:36:31 -0000 1.30
@@ -397,8 +397,14 @@
break;
case PARALLAX_FILE_null:
break;
- case RUN_LIST:
+ case RUN_LIST: {
+ uint32 *list = (uint32 *)file;
+ while (*list) {
+ SWAP32(*list);
+ list++;
+ }
break;
+ }
case TEXT_FILE: {
_textHeader *textHeader = (_textHeader *)file;
SWAP32(textHeader->noOfLines);
Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/logic.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- logic.cpp 9 Sep 2003 12:45:33 -0000 1.8
+++ logic.cpp 13 Sep 2003 17:36:31 -0000 1.9
@@ -81,7 +81,7 @@
Con_fatal_error("Logic_engine %d not a run_list", run_list);
game_object_list = (uint32 *) (head+1);
- ID = FROM_LE_32(game_object_list[pc++]); //read the next id
+ ID = game_object_list[pc++]; //read the next id
id=ID;
res_man.Res_close(run_list); //release the list again so it can float in memory - at this point not one thing should be locked
More information about the Scummvm-git-logs
mailing list