[Scummvm-cvs-logs] CVS: scummvm sdl.cpp,1.134,1.135 sdl_gl.cpp,1.5,1.6
Max Horn
fingolfin at users.sourceforge.net
Tue Jul 23 03:52:03 CEST 2002
Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv28383
Modified Files:
sdl.cpp sdl_gl.cpp
Log Message:
merged some diffs between sdl.cpp and sdl_gl.cpp. Ideally, one should be the subclass of the other, or they should share a common baseclass - a lot of code is duplicated, and we have to fix bugs in two places.
Index: sdl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sdl.cpp,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -d -r1.134 -r1.135
--- sdl.cpp 17 Jul 2002 20:55:36 -0000 1.134
+++ sdl.cpp 23 Jul 2002 10:51:17 -0000 1.135
@@ -33,8 +33,6 @@
#include <SDL.h>
#include <SDL_thread.h>
-#define MAX(a,b) (((a)<(b)) ? (b) : (a))
-#define MIN(a,b) (((a)>(b)) ? (b) : (a))
class OSystem_SDL : public OSystem {
public:
@@ -960,7 +958,6 @@
quit();
}
}
-
}
bool OSystem_SDL::set_sound_proc(void *param, SoundProc *proc, byte format) {
Index: sdl_gl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sdl_gl.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- sdl_gl.cpp 22 Jul 2002 18:11:48 -0000 1.5
+++ sdl_gl.cpp 23 Jul 2002 10:51:17 -0000 1.6
@@ -21,15 +21,17 @@
*/
#include "stdafx.h"
-#include "scumm.h"
+#include "scummsys.h"
+#include "system.h"
#include "mididrv.h"
-#include "SDL_thread.h"
#include "gameDetector.h"
#include "scaler.h"
+#include "scumm.h" // Only #included for error() and warning()
#include "scummvm.xpm"
#include <SDL.h>
+#include <SDL_thread.h>
#ifdef WIN32
/* Use OpenGL 1.1 */
@@ -39,9 +41,6 @@
#include "fb2opengl.h"
-#define MAX(a,b) (((a)<(b)) ? (b) : (a))
-#define MIN(a,b) (((a)>(b)) ? (b) : (a))
-
class OSystem_SDL : public OSystem {
public:
// Set colors of the palette
@@ -160,7 +159,7 @@
Uint32 cd_end_time, cd_stop_time, cd_next_second;
struct MousePos {
- int16 x,y,w,h;
+ int16 x, y, w, h;
};
byte *_mouse_data;
@@ -574,7 +573,7 @@
break;
}
- if (b == KBD_CTRL && ev.key.keysym.sym=='z') {
+ if ((b == KBD_CTRL && ev.key.keysym.sym=='z') || (b == KBD_ALT && ev.key.keysym.sym=='x')) {
quit();
break;
}
@@ -689,7 +688,7 @@
unload_gfx_mode();
load_gfx_mode();
- fb2gl_set_palette(0,256);
+ fb2gl_set_palette(0,256);
fb2gl_update(sdl_tmpscreen->pixels,320,200,320,0,_current_shake_pos);
/* blit image */
More information about the Scummvm-git-logs
mailing list