projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added lag prevention to door/request/envelope animations
[rocksndiamonds.git]
/
src
/
libgame
/
sdl.c
diff --git
a/src/libgame/sdl.c
b/src/libgame/sdl.c
index 8b8720c320fcfe182b5bdbbb3958d03034aeb9ce..32635b5341a6f4ff7bfb6530742ae22482628e1b 100644
(file)
--- a/
src/libgame/sdl.c
+++ b/
src/libgame/sdl.c
@@
-454,7
+454,7
@@
void SDLInitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window,
/* !!! SDL2 can only set the window icon if the window already exists !!! */
/* set window icon */
/* !!! SDL2 can only set the window icon if the window already exists !!! */
/* set window icon */
- SDLSetWindowIcon(program.
sdl_
icon_filename);
+ SDLSetWindowIcon(program.icon_filename);
/* set window and icon title */
#if defined(TARGET_SDL2)
/* set window and icon title */
#if defined(TARGET_SDL2)
@@
-716,9
+716,12
@@
boolean SDLSetVideoMode(DrawBuffer **backbuffer, boolean fullscreen)
SDLRedrawWindow(); // map window
#endif
SDLRedrawWindow(); // map window
#endif
+#ifdef DEBUG
+#if defined(PLATFORM_WIN32)
+ // experimental drag and drop code
+
SDL_EventState(SDL_SYSWMEVENT, SDL_ENABLE);
SDL_EventState(SDL_SYSWMEVENT, SDL_ENABLE);
-#if defined(PLATFORM_WIN32)
{
SDL_SysWMinfo wminfo;
HWND hwnd;
{
SDL_SysWMinfo wminfo;
HWND hwnd;
@@
-743,6
+746,7
@@
boolean SDLSetVideoMode(DrawBuffer **backbuffer, boolean fullscreen)
DragAcceptFiles(hwnd, TRUE);
}
}
DragAcceptFiles(hwnd, TRUE);
}
}
+#endif
#endif
return success;
#endif
return success;
@@
-2373,7
+2377,10
@@
void SDLNextEvent(Event *event)
void SDLHandleWindowManagerEvent(Event *event)
{
void SDLHandleWindowManagerEvent(Event *event)
{
+#ifdef DEBUG
#if defined(PLATFORM_WIN32)
#if defined(PLATFORM_WIN32)
+ // experimental drag and drop code
+
SDL_SysWMEvent *syswmevent = (SDL_SysWMEvent *)event;
SDL_SysWMmsg *syswmmsg = (SDL_SysWMmsg *)(syswmevent->msg);
SDL_SysWMEvent *syswmevent = (SDL_SysWMEvent *)event;
SDL_SysWMmsg *syswmmsg = (SDL_SysWMmsg *)(syswmevent->msg);
@@
-2411,6
+2418,7
@@
void SDLHandleWindowManagerEvent(Event *event)
#endif
}
#endif
#endif
}
#endif
+#endif
}
}