projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
minor code formatting changes
[rocksndiamonds.git]
/
src
/
init.c
diff --git
a/src/init.c
b/src/init.c
index 3ab46d0f1b2b54e31265149df4209e1dcc6b3016..d3b33ec219b723d71da1cd2011f07267fe7b2407 100644
(file)
--- a/
src/init.c
+++ b/
src/init.c
@@
-1301,8
+1301,8
@@
static void set_graphic_parameters_ext(int graphic, int *parameter,
g->anim_delay_random = 0;
g->post_delay_fixed = 0;
g->post_delay_random = 0;
g->anim_delay_random = 0;
g->post_delay_fixed = 0;
g->post_delay_random = 0;
- g->init_event = ANIM_EVENT_
DEFAULT
;
- g->anim_event = ANIM_EVENT_
DEFAULT
;
+ g->init_event = ANIM_EVENT_
UNDEFINED
;
+ g->anim_event = ANIM_EVENT_
UNDEFINED
;
g->init_event_action = -1;
g->anim_event_action = -1;
g->draw_masked = FALSE;
g->init_event_action = -1;
g->anim_event_action = -1;
g->draw_masked = FALSE;
@@
-1723,6
+1723,8
@@
static void InitGraphicInfo(void)
-1
};
-1
};
+ FreeGlobalAnimEventInfo();
+
checked_free(graphic_info);
graphic_info = checked_calloc(num_images * sizeof(struct GraphicInfo));
checked_free(graphic_info);
graphic_info = checked_calloc(num_images * sizeof(struct GraphicInfo));
@@
-6061,6
+6063,8
@@
void OpenAll(void)
InitNetworkSettings();
InitNetworkSettings();
+ InitRuntimeInfo();
+
if (network.serveronly)
{
#if defined(PLATFORM_UNIX)
if (network.serveronly)
{
#if defined(PLATFORM_UNIX)
@@
-6194,16
+6198,13
@@
void CloseAllAndExit(int exit_value)
FreeAllImages();
FreeAllImages();
-#if defined(TARGET_SDL)
-#if defined(TARGET_SDL2)
// !!! TODO !!!
// set a flag to tell the network server thread to quit and wait for it
// using SDL_WaitThread()
// !!! TODO !!!
// set a flag to tell the network server thread to quit and wait for it
// using SDL_WaitThread()
-#else
- if (network_server) // terminate network server
- SDL_KillThread(server_thread);
-#endif
-#endif
+ //
+ // Code used with SDL 1.2:
+ // if (network_server) // terminate network server
+ // SDL_KillThread(server_thread);
CloseVideoDisplay();
ClosePlatformDependentStuff();
CloseVideoDisplay();
ClosePlatformDependentStuff();