[Scummvm-cvs-logs] CVS: scummvm/sword2 sword2.cpp,1.155,1.156
Max Horn
fingolfin at users.sourceforge.net
Sat Jan 21 05:02:03 CET 2006
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/tools md5table.c,1.11,1.12
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm debugger.cpp,1.157,1.158 resource.cpp,1.356,1.357 resource_v7he.cpp,1.57,1.58 scumm-md5.h,2.164,2.165 scumm.cpp,1.699,1.700 scumm.h,1.670,1.671 sound.cpp,1.502,1.503 sound_he.cpp,2.19,2.20
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/sword2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20363/sword2
Modified Files:
sword2.cpp
Log Message:
Fix various incorrect usages of the word 'target' instead of 'gameid'; change the ambigiuous 'GameSettings::name' to 'GameSettings::gameid'
Index: sword2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/sword2.cpp,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -d -r1.155 -r1.156
--- sword2.cpp 19 Jan 2006 23:11:56 -0000 1.155
+++ sword2.cpp 21 Jan 2006 13:01:20 -0000 1.156
@@ -46,12 +46,12 @@
#endif
struct Sword2GameSettings {
- const char *name;
+ const char *gameid;
const char *description;
uint32 features;
const char *detectname;
GameSettings toGameSettings() const {
- GameSettings dummy = { name, description, features };
+ GameSettings dummy = { gameid, description, features };
return dummy;
}
};
@@ -67,7 +67,7 @@
GameList Engine_SWORD2_gameList() {
const Sword2GameSettings *g = sword2_settings;
GameList games;
- while (g->name) {
+ while (g->gameid) {
games.push_back(g->toGameSettings());
g++;
}
@@ -82,7 +82,7 @@
// between the 'sword2' and 'sword2demo' targets. The current code
// can't do that since they use the same detectname.
- for (g = sword2_settings; g->name; ++g) {
+ for (g = sword2_settings; g->gameid; ++g) {
// Iterate over all files in the given directory
for (FSList::const_iterator file = fslist.begin(); file != fslist.end(); ++file) {
if (!file->isDirectory()) {
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/tools md5table.c,1.11,1.12
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm debugger.cpp,1.157,1.158 resource.cpp,1.356,1.357 resource_v7he.cpp,1.57,1.58 scumm-md5.h,2.164,2.165 scumm.cpp,1.699,1.700 scumm.h,1.670,1.671 sound.cpp,1.502,1.503 sound_he.cpp,2.19,2.20
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list