aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnaud Boutonné2010-11-28 16:38:01 +0000
committerArnaud Boutonné2010-11-28 16:38:01 +0000
commit54b756e1baf67d0f6f7a8abea4ae3e656297a5c7 (patch)
tree401d950f7ed9f82544608ffceaa87e46157c8a88
parent5e0a441add1dfb1cff9e9868c6a4a85ea631c1ea (diff)
downloadscummvm-rg350-54b756e1baf67d0f6f7a8abea4ae3e656297a5c7.tar.gz
scummvm-rg350-54b756e1baf67d0f6f7a8abea4ae3e656297a5c7.tar.bz2
scummvm-rg350-54b756e1baf67d0f6f7a8abea4ae3e656297a5c7.zip
HUGO: Modify or suppress some obsolete comments and warnings
svn-id: r54530
-rw-r--r--engines/hugo/game.h8
-rw-r--r--engines/hugo/parser.cpp4
-rw-r--r--engines/hugo/parser_v1w.cpp1
-rw-r--r--engines/hugo/schedule_v2d.cpp1
-rw-r--r--engines/hugo/util.cpp5
5 files changed, 6 insertions, 13 deletions
diff --git a/engines/hugo/game.h b/engines/hugo/game.h
index 01e3788ad0..a4f450bfbf 100644
--- a/engines/hugo/game.h
+++ b/engines/hugo/game.h
@@ -42,15 +42,11 @@ class SeekableReadStream;
namespace Hugo {
-// WARNING!! Run the program at least once before release to
-// generate the initial save file! (Using the -i cmd switch)
-// Set EPISODE_NUM & build. Build pictures.mak and run "Tools/Hugo N".
-// Copy helpedit\hugow_?.hlp to .\hugowin?.hlp
+// WARNING!!
// Type "PPG" in the game to enter cheat mode.
#define COPYRIGHT "Copyright 1989-1997 David P Gray, All Rights Reserved."
// Started code on 04/01/95
-// Don't forget to update Hugowin.rc2 with version info
//#define VER "1.0" // 10/01/95 Initial Release
//#define VER "1.1" // 10/06/95 Restore system volume levels on exit
//#define VER "v1.2"// 10/12/95 Added "background music" checkbox in volume dlg
@@ -97,7 +93,7 @@ namespace Hugo {
#define NAME_LEN 12 // Max length of a DOS file name
// Definitions of 'generic' commands: Max # depends on size of gencmd in
-// the object_t record since each requires 1 bit. Currently up to 16
+// the object_t record since each requires 1 bit. Currently up to 16
#define LOOK 1
#define TAKE 2
#define DROP 4
diff --git a/engines/hugo/parser.cpp b/engines/hugo/parser.cpp
index e6f88fd556..f23427e690 100644
--- a/engines/hugo/parser.cpp
+++ b/engines/hugo/parser.cpp
@@ -111,7 +111,7 @@ void Parser::keyHandler(uint16 nChar, uint16 nFlags) {
gameStatus.viewState = V_PLAY;
break;
case Common::KEYCODE_F9: // Boss button
- warning("STUB: KeyHandler() - F4-F5-F9 (DOS)");
+ warning("STUB: F9 (DOS) - BossKey");
break;
default: // Any other key
if (!gameStatus.storyModeFl) { // Keyboard disabled
@@ -167,7 +167,7 @@ void Parser::charHandler() {
default: // Normal text key, add to line
if (lineIndex >= MAX_CHARS) {
//MessageBeep(MB_ICONASTERISK);
- warning("STUB: MessageBeep(MB_ICONASTERISK);");
+ warning("STUB: MessageBeep() - Command line too long");
} else if (isprint(c)) {
cmdLine[lineIndex++] = c;
cmdLine[lineIndex] = '\0';
diff --git a/engines/hugo/parser_v1w.cpp b/engines/hugo/parser_v1w.cpp
index 9155942130..4bfdd281ba 100644
--- a/engines/hugo/parser_v1w.cpp
+++ b/engines/hugo/parser_v1w.cpp
@@ -120,7 +120,6 @@ bool Parser_v1w::isGenericVerb(object_t *obj, char *comment) {
// Test state-dependent look before general look
if ((obj->genericCmd & LOOK_S) == LOOK_S) {
Utils::Box(BOX_ANY, "%s", _vm->_textData[obj->stateDataIndex[obj->state]]);
- warning("isGenericVerb: use of state dependant look - To be validated");
} else {
if ((LOOK & obj->genericCmd) == LOOK) {
if (_vm->_textData[obj->dataIndex])
diff --git a/engines/hugo/schedule_v2d.cpp b/engines/hugo/schedule_v2d.cpp
index 7e8c0cd900..307d1ac46d 100644
--- a/engines/hugo/schedule_v2d.cpp
+++ b/engines/hugo/schedule_v2d.cpp
@@ -343,7 +343,6 @@ event_t *Scheduler_v2d::doAction(event_t *curEvent) {
Utils::Box(BOX_ANY, TAKE_TEXT, _vm->_arrayNouns[_vm->_object->_objects[action->a42.objNumb].nounIndex][TAKE_NAME]);
break;
case YESNO: // act43: Prompt user for Yes or No
- warning("doAction(act43) - Yes/No Box");
if (Utils::Box(BOX_YESNO, "%s", _vm->_file->fetchString(action->a43.promptIndex)) != 0)
insertActionList(action->a43.actYesIndex);
else
diff --git a/engines/hugo/util.cpp b/engines/hugo/util.cpp
index bad97d80c5..ab9fcb0c2b 100644
--- a/engines/hugo/util.cpp
+++ b/engines/hugo/util.cpp
@@ -98,7 +98,7 @@ char *Utils::Box(box_t dismiss, const char *s, ...) {
return 0;
if (strlen(s) > MAX_STRLEN - 100) { // Test length
- warning("String too big: '%s'", s);
+ warning("String too long: '%s'", s);
return 0;
}
@@ -139,8 +139,7 @@ char *Utils::Box(box_t dismiss, const char *s, ...) {
* Print options for user when dead
*/
void Utils::gameOverMsg(void) {
- //MessageBox(hwnd, gameoverstring, "Be more careful next time!", MB_OK | MB_ICONINFORMATION);
- warning("STUB: Gameover_msg(): %s", HugoEngine::get()._textUtil[kGameOver]);
+ Utils::Box(BOX_OK, "%s", HugoEngine::get()._textUtil[kGameOver]);
}
char *Utils::strlwr(char *buffer) {