projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed unused functions to set/get internal error messages
[rocksndiamonds.git]
/
src
/
libgame
/
system.c
diff --git
a/src/libgame/system.c
b/src/libgame/system.c
index b0b8d4775236b8005ed1a5cae12ee39cb411be46..67995e3d82c2da295693988cc924af443b93dfa4 100644
(file)
--- a/
src/libgame/system.c
+++ b/
src/libgame/system.c
@@
-114,6
+114,9
@@
void InitNetworkInfo(boolean enabled, boolean connected, boolean serveronly,
network.server_host = server_host;
network.server_port = server_port;
network.server_host = server_host;
network.server_port = server_port;
+
+ network.server_thread = NULL;
+ network.is_server_thread = FALSE;
}
void InitRuntimeInfo()
}
void InitRuntimeInfo()
@@
-191,7
+194,7
@@
void InitPlatformDependentStuff(void)
int sdl_init_flags = SDL_INIT_EVENTS | SDL_INIT_NOPARACHUTE;
if (SDL_Init(sdl_init_flags) < 0)
int sdl_init_flags = SDL_INIT_EVENTS | SDL_INIT_NOPARACHUTE;
if (SDL_Init(sdl_init_flags) < 0)
-
Error(ERR_EXIT,
"SDL_Init() failed: %s", SDL_GetError());
+
Fail(
"SDL_Init() failed: %s", SDL_GetError());
SDLNet_Init();
}
SDLNet_Init();
}
@@
-1154,10
+1157,10
@@
Bitmap *LoadCustomImage(char *basename)
Bitmap *new_bitmap;
if (filename == NULL)
Bitmap *new_bitmap;
if (filename == NULL)
-
Error(ERR_EXIT,
"LoadCustomImage(): cannot find file '%s'", basename);
+
Fail(
"LoadCustomImage(): cannot find file '%s'", basename);
if ((new_bitmap = LoadImage(filename)) == NULL)
if ((new_bitmap = LoadImage(filename)) == NULL)
-
Error(ERR_EXIT, "LoadImage('%s') failed: %s", basename, GetError()
);
+
Fail("LoadImage('%s') failed", basename
);
return new_bitmap;
}
return new_bitmap;
}
@@
-1185,7
+1188,7
@@
void ReloadCustomImage(Bitmap *bitmap, char *basename)
if ((new_bitmap = LoadImage(filename)) == NULL)
{
if ((new_bitmap = LoadImage(filename)) == NULL)
{
- Warn("LoadImage('%s') failed
: %s", basename, GetError()
);
+ Warn("LoadImage('%s') failed
", basename
);
return;
}
return;
}