diff options
| author | Torbjörn Andersson | 2003-09-30 09:27:27 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2003-09-30 09:27:27 +0000 |
| commit | 568a4bd8394e8ada14c6dabb1dda149c8e5f5608 (patch) | |
| tree | b96d7c29d6c68b9dbe549242e93993e1cfd195fe /sword2/console.cpp | |
| parent | e70fcf1737812b3afa35f5350ba80e07d8359569 (diff) | |
| download | scummvm-rg350-568a4bd8394e8ada14c6dabb1dda149c8e5f5608.tar.gz scummvm-rg350-568a4bd8394e8ada14c6dabb1dda149c8e5f5608.tar.bz2 scummvm-rg350-568a4bd8394e8ada14c6dabb1dda149c8e5f5608.zip | |
Changed the resource manager object to use more ScummVM-like naming.
svn-id: r10499
Diffstat (limited to 'sword2/console.cpp')
| -rw-r--r-- | sword2/console.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sword2/console.cpp b/sword2/console.cpp index 3232aa4f5d..b90f99ab7c 100644 --- a/sword2/console.cpp +++ b/sword2/console.cpp @@ -453,7 +453,7 @@ uint32 Parse_user_input(void) { Print_to_console("What about him?"); return 0; case 6: // RES - res_man.Print_console_clusters(); + res_man.printConsoleClusters(); return 0; case 7: // STARTS Con_print_start_menu(); @@ -493,7 +493,7 @@ uint32 Parse_user_input(void) { Print_to_console("player feet marker off"); return 0; case 13: // RESLOOK - res_man.Examine_res(&input[1][0]); + res_man.examine(&input[1][0]); return 0; case 14: // CUR Print_current_info(); @@ -502,12 +502,12 @@ uint32 Parse_user_input(void) { LLogic.examineRunList(); return 0; case 16: // KILL - res_man.Kill_res(&input[1][0]); + res_man.kill(&input[1][0]); return 0; case 17: // NUKE Print_to_console("killing all resources except variable file & player object..."); // '1' means we want output to console - res_man.Kill_all_res(1); + res_man.killAll(1); return 0; case 19: // VAR if (total_commands == 2) @@ -527,7 +527,7 @@ uint32 Parse_user_input(void) { case 21: // CLEAR Print_to_console("killing all object resources except player..."); // '1' means we want output to console - res_man.Kill_all_objects(1); + res_man.killAllObjects(1); return 0; case 22: // DEBUGON displayDebugText = 1; @@ -754,7 +754,7 @@ void Con_print(uint8 *ascii, uint32 pen, uint32 paper) { int chr, x = 0; // open font file - charSet = res_man.Res_open(CONSOLE_FONT_ID); + charSet = res_man.open(CONSOLE_FONT_ID); do { chr = (int) *(ascii); @@ -770,7 +770,7 @@ void Con_print(uint8 *ascii, uint32 pen, uint32 paper) { } while(*(ascii)); // close font file - res_man.Res_close(CONSOLE_FONT_ID); + res_man.close(CONSOLE_FONT_ID); } void Con_colour_block(int x, int width, int height, uint32 pen, uint32 paper, uint8 *sprite_data_ad) { @@ -835,7 +835,7 @@ void Var_check(uint8 *pointer) { sscanf((char *) pointer, "%d", &var); - Print_to_console("%d", *(uint32 *) (res_man.resList[1]->ad + sizeof(_standardHeader) + 4 * var)); + Print_to_console("%d", *(uint32 *) (res_man._resList[1]->ad + sizeof(_standardHeader) + 4 * var)); } void Var_set(uint8 *pointer, uint8 *p2) { @@ -845,9 +845,9 @@ void Var_set(uint8 *pointer, uint8 *p2) { sscanf((char *) pointer, "%d", &var); sscanf((char *) p2, "%d", &val); - Print_to_console("was %d", *(uint32 *) (res_man.resList[1]->ad + sizeof(_standardHeader) + 4 * var)); + Print_to_console("was %d", *(uint32 *) (res_man._resList[1]->ad + sizeof(_standardHeader) + 4 * var)); - *(uint32 *) (res_man.resList[1]->ad + sizeof(_standardHeader) + 4 * var) = val; + *(uint32 *) (res_man._resList[1]->ad + sizeof(_standardHeader) + 4 * var) = val; Print_to_console("now %d", val); } |