[Scummvm-cvs-logs] CVS: scummvm/bs2 function.cpp,1.23,1.24 layers.cpp,1.11,1.12 maketext.cpp,1.20,1.21
Torbj?rn Andersson
eriktorbjorn at users.sourceforge.net
Tue Oct 7 00:08:06 CEST 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/bs2 controls.cpp,1.27,1.28
- Next message: [Scummvm-cvs-logs] CVS: scummvm/bs2/driver driver96.h,1.54,1.55 language.cpp,1.8,1.9 palette.cpp,1.20,1.21 rdwin.cpp,1.31,1.32 render.cpp,1.34,1.35
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/bs2
In directory sc8-pr-cvs1:/tmp/cvs-serv2418
Modified Files:
function.cpp layers.cpp maketext.cpp
Log Message:
Some cleanup, some code removal and some unstubbing. Nothing important.
Index: function.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/function.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- function.cpp 4 Oct 2003 08:07:01 -0000 1.23
+++ function.cpp 7 Oct 2003 07:07:46 -0000 1.24
@@ -198,7 +198,7 @@
return FN_pause(pars);
}
-int32 FN_pass_graph(int32 *params) { // Tony28Nov96
+int32 FN_pass_graph(int32 *params) {
// makes an engine local copy of passed graphic_structure and
// mega_structure - run script 4 of an object to request this
// used by FN_turn_to(id) etc
@@ -224,7 +224,7 @@
// params 0 pointer to a mega structure
- memcpy(&engine_mega, (uint8*) params[0], sizeof(Object_mega));
+ memcpy(&engine_mega, (uint8 *) params[0], sizeof(Object_mega));
//makes no odds
return IR_CONT;
@@ -358,7 +358,7 @@
debug(5, "globals size %d", size / 4);
- globals = (uint32*) ((uint8 *) res_man.open(1) + sizeof(_standardHeader));
+ globals = (uint32 *) ((uint8 *) res_man.open(1) + sizeof(_standardHeader));
// blank each global variable
for (j = 0; j < size / 4; j++)
@@ -369,12 +369,7 @@
// all objects but george
res_man.killAllObjects(0);
- // reopen global variables resource & send address to interpreter - it
- // won't be moving
- // SetGlobalInterpreterVariables((int32 *) (res_man.open(1) + sizeof(_standardHeader)));
- // res_man.close(1);
-
- // FOR THE DEMO - FORCE THE SCROLLING TO BE RESET! (James29may97)
+ // FOR THE DEMO - FORCE THE SCROLLING TO BE RESET!
// - this is taken from FN_init_background
// switch on scrolling (2 means first time on screen)
@@ -394,9 +389,6 @@
uint8 tmpPal[1024];
int32 music_length;
int32 pars[2];
-
- // FIXME: We need a better method for saving/restoring the
- // music state as this one only restarts looping music.
g_sound->saveMusicState();
Index: layers.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/layers.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- layers.cpp 4 Oct 2003 08:07:01 -0000 1.11
+++ layers.cpp 7 Oct 2003 07:07:46 -0000 1.12
@@ -50,7 +50,6 @@
_screenHeader *screen_head;
_layerHeader *layer;
_spriteInfo spriteInfo;
- uint32 j;
uint8 *file;
uint32 rv;
@@ -83,8 +82,8 @@
if (this_screen.background_layer_id)
CloseBackgroundLayer();
- this_screen.background_layer_id = *params; // set the res id
- this_screen.new_palette = *(params + 1); // yes or no - palette is taken from layer file
+ this_screen.background_layer_id = params[0]; // set the res id
+ this_screen.new_palette = params[1]; // yes or no - palette is taken from layer file
// ok, now read the resource and pull out all the normal sort layer
// info/and set them up at the beginning of the sort list - why do it
@@ -106,19 +105,19 @@
SetLocationMetrics(screen_head->width, screen_head->height);
if (screen_head->noLayers) {
- for (j = 0; j < screen_head->noLayers; j++) {
- // get layer header for layer j
- layer = FetchLayerHeader(file, j);
+ for (int i = 0; i < screen_head->noLayers; i++) {
+ // get layer header for layer i
+ layer = FetchLayerHeader(file, i);
// add into the sort list
// need this for sorting - but leave the rest blank,
// we'll take from the header at print time
- sort_list[j].sort_y = layer->y + layer->height;
+ sort_list[i].sort_y = layer->y + layer->height;
// signifies a layer
- sort_list[j].layer_number = j + 1;
+ sort_list[i].layer_number = i + 1;
- debug(5, "init layer %d", j);
+ debug(5, "init layer %d", i);
}
}
Index: maketext.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/maketext.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- maketext.cpp 5 Oct 2003 15:28:13 -0000 1.20
+++ maketext.cpp 7 Oct 2003 07:07:47 -0000 1.21
@@ -451,7 +451,7 @@
mem *text_mem;
} text_bloc;
-text_bloc text_sprite_list[MAX_text_blocs];
+static text_bloc text_sprite_list[MAX_text_blocs];
void Init_text_bloc_system(void) {
for (int j = 0; j < MAX_text_blocs; j++)
@@ -648,15 +648,20 @@
// Get the game name for the windows application
- // FIXME: Since SetWindowName() is stubbed, this doesn't actually do
- // anything at the moment. Should it be removed?
-
// Get the text line - skip the 2 chars containing the wavId
if (g_sword2->_gameId == GID_SWORD2_DEMO)
textLine = FetchTextLine(textFile, 451) + 2;
else
textLine = FetchTextLine(textFile, 54) + 2;
+
+ // According to the GetNameFunction(), which was never called and has
+ // therefore been removed, the name of the game is:
+ //
+ // ENGLISH: "Broken Sword II"
+ // AMERICAN: "Circle of Blood II"
+ // GERMAN: "Baphomet's Fluch II"
+ // default: "Some game or other, part 86"
SetWindowName((char *) textLine);
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/bs2 controls.cpp,1.27,1.28
- Next message: [Scummvm-cvs-logs] CVS: scummvm/bs2/driver driver96.h,1.54,1.55 language.cpp,1.8,1.9 palette.cpp,1.20,1.21 rdwin.cpp,1.31,1.32 render.cpp,1.34,1.35
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list