Only in sources-orig/ddtmpq/bgs: credddt.r~ diff -r -w -u sources-orig/hooks/ddtgrfx_sdl_surface.cpp sources/hooks/ddtgrfx_sdl_surface.cpp --- sources-orig/hooks/ddtgrfx_sdl_surface.cpp 2011-07-22 02:20:06.000000000 +0200 +++ sources/hooks/ddtgrfx_sdl_surface.cpp 2011-07-28 14:23:02.738837539 +0200 @@ -19,6 +19,10 @@ #include "SDL/SDL.h" + +#define HIGHLIGHT_RED 0 +#define HIGHLIGHT_YELLOW 1 + using namespace std; class ddtgrfx_texob @@ -58,11 +62,11 @@ SDL_QuitSubSystem(SDL_INIT_VIDEO); } - static int init_display(int display_w, int display_h, char* caption) + static int init_display(int display_w, int display_h, string caption) { SDL_SetVideoMode( display_w, display_h, 32, SDL_SWSURFACE ); SDL_SetAlpha(SDL_GetVideoSurface(), SDL_SRCALPHA, 255 ); - SDL_WM_SetCaption( caption, NULL ); + SDL_WM_SetCaption( caption.c_str(), NULL ); SDL_ShowCursor(SDL_DISABLE); //hide the default mouse @@ -142,7 +146,7 @@ SDL_BlitSurface( (*texob).texob, NULL, SDL_GetVideoSurface(), &offset ); } - static void render_texob_selected(ddtgrfx_texob* texob, float x, float y, float strech, int display_w, int display_h) + static void render_texob_highlight(int hi_code, ddtgrfx_texob* texob, float x, float y, float strech, int display_w, int display_h) { render_texob(texob, x, y, strech, 1.0, 1.0, 1.0, 1.0, display_w, display_h); } diff -r -w -u sources-orig/levg_aud_audio.cpp sources/levg_aud_audio.cpp --- sources-orig/levg_aud_audio.cpp 2011-07-22 02:20:06.000000000 +0200 +++ sources/levg_aud_audio.cpp 2011-07-28 13:31:43.000000000 +0200 @@ -94,7 +94,7 @@ { if (chan_active[i]) { - if((chan_sample_pak[i] == pak) ) + if(chan_sample_pak[i] == pak ) { chan_active[i] = false; } diff -r -w -u sources-orig/levg_tsc_transcode.cpp sources/levg_tsc_transcode.cpp --- sources-orig/levg_tsc_transcode.cpp 2011-07-22 02:20:12.000000000 +0200 +++ sources/levg_tsc_transcode.cpp 2011-07-28 13:32:19.000000000 +0200 @@ -87,12 +87,12 @@ out = celmake.uifuse((*in).allog, (*in).filea, (*in).size_filea, (*in).fileb, (*in).size_fileb, (*global).palkeep.pal[(*in).palno] ); } - else if ( ((*in).allog == PCX) ) + else if ( (*in).allog == PCX ) { out = pcxmake.pcx_bulk((*in).frames, (*in).filea, (*in).size_filea, (*in).alpha, (*in).chunkyness, (*in).x_move, (*in).y_move, (*global).display_gamma, (*in).valuemap_ref); } - else if ( ((*in).allog == MAP) ) + else if ( (*in).allog == MAP ) { out = mapmake.map( (*in).filea, (*in).x_size, (*in).y_size, (*in).x_move, (*in).y_move); } diff -r -w -u sources-orig/levx_mul_utils.cpp sources/levx_mul_utils.cpp --- sources-orig/levx_mul_utils.cpp 2011-07-22 02:20:10.000000000 +0200 +++ sources/levx_mul_utils.cpp 2011-07-28 13:31:19.000000000 +0200 @@ -96,7 +96,7 @@ while ( argumentpoint < rules_size && argumentpoint < mem_off + 100 && !argumentdone) { - if ( (rules[argumentpoint] == ']') ) + if ( rules[argumentpoint] == ']' ) { argumentdone = true; } diff -r -w -u sources-orig/levz_mul.h sources/levz_mul.h --- sources-orig/levz_mul.h 2011-07-22 02:20:06.000000000 +0200 +++ sources/levz_mul.h 2011-07-28 14:22:03.735818396 +0200 @@ -47,8 +47,8 @@ -#include "hooks/ddtgrfx_sdl_opengl.cpp" -//#include "hooks/ddtgrfx_sdl_surface.cpp" +//#include "hooks/ddtgrfx_sdl_opengl.cpp" +#include "hooks/ddtgrfx_sdl_surface.cpp"