[Scummvm-cvs-logs] CVS: scummvm/saga animation.cpp,1.23,1.24 game.cpp,1.20,1.21 game.h,1.7,1.8 game_mod.h,1.6,1.7 image.cpp,1.14,1.15 interface.cpp,1.21,1.22 music.cpp,1.22,1.23 palanim.cpp,1.14,1.15 saga.cpp,1.47,1.48 scene.cpp,1.35,1.36 script.cpp,1.22,1.23 sndres.cpp,1.19,1.20
Jonathan Gray
khalek at users.sourceforge.net
Thu Aug 26 18:33:09 CEST 2004
Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12739
Modified Files:
animation.cpp game.cpp game.h game_mod.h image.cpp
interface.cpp music.cpp palanim.cpp saga.cpp scene.cpp
script.cpp sndres.cpp
Log Message:
R_GAMETYPE -> GID, remove unused supported flag and trim some unused bits of GAME
Index: animation.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/animation.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- animation.cpp 10 Aug 2004 23:04:51 -0000 1.23
+++ animation.cpp 27 Aug 2004 01:32:10 -0000 1.24
@@ -96,7 +96,7 @@
new_anim->resdata = anim_resdata;
new_anim->resdata_len = anim_resdata_len;
- if (GAME_GetGameType() == R_GAMETYPE_ITE) {
+ if (GAME_GetGameType() == GID_ITE) {
if (getNumFrames(anim_resdata, anim_resdata_len, &new_anim->n_frames) != R_SUCCESS) {
warning("Anim::load Couldn't get animation frame count");
return R_FAILURE;
@@ -198,7 +198,7 @@
if (anim->play_flag) {
frame = anim->current_frame;
- if (GAME_GetGameType() == R_GAMETYPE_ITE) {
+ if (GAME_GetGameType() == GID_ITE) {
result = ITE_DecodeFrame(anim->resdata, anim->resdata_len, anim->frame_offsets[frame - 1], display_buf,
disp_info.logical_w * disp_info.logical_h);
if (result != R_SUCCESS) {
@@ -353,7 +353,7 @@
return R_FAILURE;
}
- if (GAME_GetGameType() == R_GAMETYPE_ITE) {
+ if (GAME_GetGameType() == GID_ITE) {
free(anim->frame_offsets);
anim->frame_offsets = NULL;
}
@@ -391,7 +391,7 @@
ah.unknown07 = readS.readByte();
ah.nframes = readS.readByte();
- if (GAME_GetGameType() == R_GAMETYPE_IHNM) {
+ if (GAME_GetGameType() == GID_IHNM) {
*n_frames = ah.nframes;
}
Index: game.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/game.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- game.cpp 22 Aug 2004 18:28:42 -0000 1.20
+++ game.cpp 27 Aug 2004 01:32:10 -0000 1.21
@@ -159,7 +159,7 @@
// Inherit the earth - DOS Demo version
{
"ite-demo",
- R_GAMETYPE_ITE,
+ GID_ITE,
R_GAME_ITE_DEMO, // Game id
"Inherit the Earth (DOS Demo)", // Game title
320, 200, // Logical resolution
@@ -171,14 +171,13 @@
ARRAYSIZE(ITEDEMO_GameFonts),
ITEDEMO_GameFonts,
&ITEDEMO_GameSound,
- 0,
- 0 // Game supported flag
+ 0 // features
},
// Inherit the earth - win32 Wyrmkeep Demo version
{
"ite-demo-win",
- R_GAMETYPE_ITE,
+ GID_ITE,
R_GAME_ITE_WINDEMO,
"Inherit the Earth (Win32 Demo)",
320, 200,
@@ -190,7 +189,6 @@
ARRAYSIZE(ITECD_GameFonts),
ITECD_GameFonts,
&ITECD_GameSound,
- 0,
0
},
@@ -198,7 +196,7 @@
// NOTE: it should be before floppy version
{
"itecd",
- R_GAMETYPE_ITE,
+ GID_ITE,
R_GAME_ITE_CD,
"Inherit the Earth (DOS CD Version)",
320, 200,
@@ -210,14 +208,13 @@
ARRAYSIZE(ITECD_GameFonts),
ITECD_GameFonts,
&ITECD_GameSound,
- 0,
- 1
+ 0
},
// Inherit the earth - Disk version
{
"ite",
- R_GAMETYPE_ITE,
+ GID_ITE,
R_GAME_ITE_DISK,
"Inherit the Earth (DOS)",
320, 200,
@@ -229,14 +226,13 @@
ARRAYSIZE(ITEDISK_GameFonts),
ITEDISK_GameFonts,
&ITE_GameSound,
- 0,
- 1
+ 0
},
// I Have No Mouth And I Must Scream - Demo version
{
"ihnm-demo",
- R_GAMETYPE_IHNM,
+ GID_IHNM,
R_GAME_IHNM_DEMO,
"I Have No Mouth and I Must Scream (DOS Demo)",
640, 480,
@@ -248,14 +244,13 @@
0,
NULL,
&IHNM_GameSound,
- GF_DEFAULT_TO_1X_SCALER,
- 0
+ GF_DEFAULT_TO_1X_SCALER
},
// I Have No Mouth And I Must Scream - CD version
{
"ihnm",
- R_GAMETYPE_IHNM,
+ GID_IHNM,
R_GAME_IHNM_CD,
"I Have No Mouth and I Must Scream (DOS)",
640, 480,
@@ -267,8 +262,7 @@
ARRAYSIZE(IHNMCD_GameFonts),
IHNMCD_GameFonts,
&IHNM_GameSound,
- GF_DEFAULT_TO_1X_SCALER,
- 1
+ GF_DEFAULT_TO_1X_SCALER
}
};
@@ -316,22 +310,12 @@
game_dir = GameModule.game_dir;
if (DetectGame(game_dir, &game_n) != R_SUCCESS) {
- GameModule.err_str = "No valid games were found in the specified directory.";
- return R_FAILURE;
- }
-
- if (!GameDescs[game_n].gd_supported) {
- GameModule.err_str = "This game is not currently supported.";
- return R_FAILURE;
- }
-
- if (!GameDescs[game_n].gd_supported) {
- GameModule.err_str = "This game is not currently supported.";
+ warning("No valid games were found in the specified directory.");
return R_FAILURE;
}
if (LoadGame(game_dir, game_n) != R_SUCCESS) {
- GameModule.err_str = "Error loading game resource files.";
+ warning("Error loading game resource files.");
return R_FAILURE;
}
@@ -343,14 +327,13 @@
int LoadLanguage() {
char lang_file[R_MAXPATH];
-// char lang_path[R_MAXPATH];
uint16 game_n;
File test_file;
game_n = GameModule.game_number;
- if (GameDescs[game_n].gd_game_type == R_GAMETYPE_ITE) {
+ if (GameDescs[game_n].gd_game_type == GID_ITE) {
snprintf(lang_file, R_MAXPATH, "%s%s.%s", R_GAME_ITE_LANG_PREFIX, GameModule.game_language, R_GAME_LANG_EXT);
if (!test_file.open(lang_file)) {
debug(0, "Couldn't open language file %s. Using default (US English)", lang_file);
@@ -379,14 +362,6 @@
return R_SUCCESS;
}
-int GAME_GetErrN() {
- return 0;
-}
-
-const char *GAME_GetErrS() {
- return GameModule.err_str == NULL ? "No error description." : GameModule.err_str;
-}
-
int GAME_GetFileContext(R_RSCFILE_CONTEXT ** ctxt_p, uint16 r_type, int param) {
R_RSCFILE_CONTEXT *found_ctxt = NULL;
uint16 i;
Index: game.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/game.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- game.h 5 May 2004 12:05:00 -0000 1.7
+++ game.h 27 Aug 2004 01:32:10 -0000 1.8
@@ -61,7 +61,6 @@
R_GAME_FONTDESC *gd_fontdescs;
R_GAME_SOUNDINFO *gd_soundinfo;
uint32 features;
- int gd_supported;
GameSettings toGameSettings() const {
GameSettings dummy = { name, gd_title, features };
Index: game_mod.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/game_mod.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- game_mod.h 1 May 2004 23:42:22 -0000 1.6
+++ game_mod.h 27 Aug 2004 01:32:10 -0000 1.7
@@ -30,11 +30,6 @@
namespace Saga {
-enum R_GAME_BASETYPES {
- R_GAMETYPE_ITE,
- R_GAMETYPE_IHNM
-};
-
enum R_GAME_IDS {
R_GAME_ITE_DEMO = 0,
R_GAME_ITE_DISK = 1,
@@ -109,9 +104,7 @@
int GAME_GetSceneInfo(R_GAME_SCENEDESC *);
int GAME_GetGame();
int GAME_GetGameType();
-int GAME_GetErrN();
void GAME_setGameDirectory(const char *gamedir);
-const char *GAME_GetErrS();
GameList GAME_GameList();
DetectedGameList GAME_ProbeGame(const FSList &fslist);
Index: image.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/image.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- image.cpp 2 Aug 2004 16:20:34 -0000 1.14
+++ image.cpp 27 Aug 2004 01:32:10 -0000 1.15
@@ -92,7 +92,7 @@
unbankBGImage(out_buf, decode_buf, hdr.width, hdr.height);
// For some reason bg images in IHNM are upside down
- if (GAME_GetGameType() == R_GAMETYPE_IHNM) {
+ if (GAME_GetGameType() == GID_IHNM) {
flipImage(out_buf, hdr.width, hdr.height);
}
Index: interface.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/interface.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- interface.cpp 12 Aug 2004 23:57:45 -0000 1.21
+++ interface.cpp 27 Aug 2004 01:32:10 -0000 1.22
@@ -156,13 +156,13 @@
// Initialize interface data by game type
game_type = GAME_GetGameType();
- if (game_type == R_GAMETYPE_ITE) {
+ if (game_type == GID_ITE) {
// Load Inherit the Earth interface desc
_cPanel.buttons = ITE_c_buttons;
_cPanel.nbuttons = ARRAYSIZE(ITE_c_buttons);
_iDesc = ITE_interface;
- } else if (game_type == R_GAMETYPE_IHNM) {
+ } else if (game_type == GID_IHNM) {
// Load I Have No Mouth interface desc
_cPanel.buttons = IHNM_c_buttons;
_cPanel.nbuttons = ARRAYSIZE(IHNM_c_buttons);
Index: music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/music.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- music.cpp 2 Aug 2004 16:20:34 -0000 1.22
+++ music.cpp 27 Aug 2004 01:32:10 -0000 1.23
@@ -210,7 +210,7 @@
File f_midi;
MidiParser *parser;
- if (GAME_GetGameType() == R_GAMETYPE_ITE) {
+ if (GAME_GetGameType() == GID_ITE) {
if (music_rn >= 9 && music_rn <= 34) {
char file_name[20];
sprintf(file_name, "music/%s.mid", _midiTableITECD[music_rn - 9].filename);
Index: palanim.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/palanim.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- palanim.cpp 10 Aug 2004 19:20:33 -0000 1.14
+++ palanim.cpp 27 Aug 2004 01:32:10 -0000 1.15
@@ -56,7 +56,7 @@
MemoryReadStream readS(resdata, resdata_len);
- if (GAME_GetGameType() == R_GAMETYPE_IHNM) {
+ if (GAME_GetGameType() == GID_IHNM) {
return R_SUCCESS;
}
Index: saga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saga.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- saga.cpp 12 Aug 2004 23:57:45 -0000 1.47
+++ saga.cpp 27 Aug 2004 01:32:10 -0000 1.48
@@ -130,7 +130,6 @@
// Detect game and open resource files
if (GAME_Init() != R_SUCCESS) {
- warning("Couldn't start the game: %s", GAME_GetErrS());
return;
}
Index: scene.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/scene.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- scene.cpp 12 Aug 2004 23:57:45 -0000 1.35
+++ scene.cpp 27 Aug 2004 01:32:10 -0000 1.36
@@ -179,10 +179,10 @@
}
switch (GAME_GetGameType()) {
- case R_GAMETYPE_ITE:
+ case GID_ITE:
ITEStartProc();
break;
- case R_GAMETYPE_IHNM:
+ case GID_IHNM:
IHNMStartProc();
break;
default:
Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/script.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- script.cpp 22 Aug 2004 18:28:42 -0000 1.22
+++ script.cpp 27 Aug 2004 01:32:10 -0000 1.23
@@ -173,7 +173,7 @@
uint32 voicelut_rn;
int result;
- if (GAME_GetGameType() == R_GAMETYPE_IHNM) {
+ if (GAME_GetGameType() == GID_IHNM) {
return R_SUCCESS;
}
Index: sndres.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sndres.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- sndres.cpp 2 Aug 2004 16:20:35 -0000 1.19
+++ sndres.cpp 27 Aug 2004 01:32:10 -0000 1.20
@@ -71,7 +71,7 @@
File f;
- if (GAME_GetGameType() == R_GAMETYPE_ITE && voice_rn == 4 && f.open("sound/p2_a.voc")) {
+ if (GAME_GetGameType() == GID_ITE && voice_rn == 4 && f.open("sound/p2_a.voc")) {
uint32 size = f.size();
byte *snd_res = (byte *)malloc(size);
f.read(snd_res, size);
@@ -228,7 +228,7 @@
// file, sound/p2_a.voc, to correct voice 4 in the intro. Use that, if
// available.
- if (GAME_GetGameType() == R_GAMETYPE_ITE && voice_rn == 4 && f.open("sound/p2_a.voc")) {
+ if (GAME_GetGameType() == GID_ITE && voice_rn == 4 && f.open("sound/p2_a.voc")) {
length = f.size();
res_type = R_GAME_SOUND_VOC;
f.close();
More information about the Scummvm-git-logs
mailing list