From a9470f8642a29badb08dd32729b6a06122898e14 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 9 Jul 2006 21:50:16 +0000 Subject: [PATCH] - Fixed: The calls to DCanvas::Dim in c_console.cpp were missing some type casts. - Fixed: CCMD(dir) passes FStrings directly to Printf. For R241: - Fixed: The defaultbind command still treated the bindings as char pointers and as a result didn't work. - Added SpawnSpotFacing ACS function which is the same as SpawnSpot but it uses the map spot's angle. - Added ThingCountName ACS function which is the same as ThingCount but it takes an actor's type name instead of a spawn ID. SVN r242 (trunk) --- docs/rh-log.txt | 2 ++ src/c_cmds.cpp | 6 +++--- src/c_console.cpp | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/docs/rh-log.txt b/docs/rh-log.txt index 193bb88a3..b2f8ea9a2 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -1,4 +1,6 @@ July 9, 2006 (Changes by Graf Zahl) +- Fixed: The calls to DCanvas::Dim in c_console.cpp were missing some type casts. +- Fixed: CCMD(dir) passes FStrings directly to Printf. - Fixed: The defaultbind command still treated the bindings as char pointers and as a result didn't work. - Added SpawnSpotFacing ACS function which is the same as SpawnSpot but it uses diff --git a/src/c_cmds.cpp b/src/c_cmds.cpp index 8fdba9794..cf84179e3 100644 --- a/src/c_cmds.cpp +++ b/src/c_cmds.cpp @@ -506,7 +506,7 @@ CCMD (dir) if (chdir (dir)) { - Printf ("%s not found\n", dir); + Printf ("%s not found\n", dir.GetChars()); return; } } @@ -521,10 +521,10 @@ CCMD (dir) } if ( (file = I_FindFirst (match, &c_file)) == ((void *)(-1))) - Printf ("Nothing matching %s%s\n", dir, match); + Printf ("Nothing matching %s%s\n", dir.GetChars(), match); else { - Printf ("Listing of %s%s:\n", dir, match); + Printf ("Listing of %s%s:\n", dir.GetChars(), match); do { if (I_FindAttr (&c_file) & FA_DIREC) diff --git a/src/c_console.cpp b/src/c_console.cpp index 48c3c4348..ec61f6f3f 100644 --- a/src/c_console.cpp +++ b/src/c_console.cpp @@ -1202,7 +1202,7 @@ void C_DrawConsole () { player = player->camera->player; } - screen->Dim (PalEntry (player->BlendR*255, player->BlendG*255, player->BlendB*255), + screen->Dim (PalEntry ((unsigned char)(player->BlendR*255), (unsigned char)(player->BlendG*255), (unsigned char)(player->BlendB*255)), player->BlendA, 0, ConBottom, screen->GetWidth(), screen->GetHeight() - ConBottom); } }