diff options
| author | Torbjörn Andersson | 2003-09-30 14:37:42 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2003-09-30 14:37:42 +0000 |
| commit | da1b4f1e3627a6baf242457cb9c69328a7f899f0 (patch) | |
| tree | b523a0e56d0122620062b206fc02d642f2c66b85 /sword2/console.cpp | |
| parent | 457f888ea7c6dc7cefc7491c5fc74b057f7ef1eb (diff) | |
| download | scummvm-rg350-da1b4f1e3627a6baf242457cb9c69328a7f899f0.tar.gz scummvm-rg350-da1b4f1e3627a6baf242457cb9c69328a7f899f0.tar.bz2 scummvm-rg350-da1b4f1e3627a6baf242457cb9c69328a7f899f0.zip | |
Moved the memory manager functions into an object of its own (and enabled
debugging levels). This needs further cleanups, but I believe I have
reached a stable point where I can commit it without too much anxiety.
svn-id: r10502
Diffstat (limited to 'sword2/console.cpp')
| -rw-r--r-- | sword2/console.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sword2/console.cpp b/sword2/console.cpp index b90f99ab7c..f4a0f535f7 100644 --- a/sword2/console.cpp +++ b/sword2/console.cpp @@ -168,10 +168,10 @@ void Init_console(void) { // Force a palatte for the console. BS2_SetPalette(CON_PEN, 1, white, RDPAL_INSTANT); - console_sprite = Twalloc(con_width * (CON_lines * con_chr_height), MEM_float, UID_con_sprite); + console_sprite = memory.alloc(con_width * (CON_lines * con_chr_height), MEM_float, UID_con_sprite); if (!console_sprite) { - ExitWithReport("Init_console Talloc fail"); + ExitWithReport("Init_console alloc fail"); } con_depth = CON_lines * con_chr_height; @@ -444,7 +444,7 @@ uint32 Parse_user_input(void) { Con_help(); return 0; case 1: // MEM - Console_mem_display(); + memory.displayMemory(); return 0; case 2: // Q // quit the console |