archives/gates_of_skeldal
2
0
Fork 0
mirror of https://github.com/ondra-novak/gates_of_skeldal.git synced 2025-07-05 14:10:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'main' of

Browse source 
https://github.com/ondra-novak/gates_of_skeldal.git into main
This commit is contained in:
Ondřej Novák 2025-03-01 12:33:29 +01:00
parent 1acb374068
commit fed5a04323
2 changed files with 13 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

19
game/gamesave.c
View file

@ -1014,15 +1014,6 @@ static int compare_strings_third_back (const void *a, const void *b) {
return -strcmp(ba,bb);
}
static int compare_by_time (const void *a, const void *b) {
const char *s1 = *(const char **)a;
const char *s2 = *(const char **)b;
size_t tm1;
size_t tm2;
memcpy(&tm1, s1 + strlen(s1)+1, sizeof(tm1));
memcpy(&tm2, s2 + strlen(s2)+1, sizeof(tm2));
return tm1<tm2?1:tm1>tm2?-1:0;
}
static int dedup_strings_prefix(TSTR_LIST lst, int count) {
int j = -1;
@ -1813,16 +1804,6 @@ int load_map_automap(char *mapfile)
return load_map_state_partial(mapfile,mapsize); //nahrej ulozenou mapu
}
static void herni_cas_for_savegame(char *c) {
int32_t inmin = game_time/6;
if (inmin >= 96*60) {
int32_t inhours = inmin/60;
sprintf(c,"%dd %dh", inhours/24, inhours%24);
} else {
sprintf(c,"%02d:%02d", inmin/60, inmin%60);
}
}
#define DEFAULT_GAME_NAME(extra) \
char game_name[100];\

2
platform/error.cpp
View file

@ -18,7 +18,7 @@ void send_log_impl(const char *format, ...) {
va_list args;
int task = q_current_task();
char buff2[1000];
char buff[1000];
char buff[1334];
va_start(args, format);
auto reltik = get_game_tick_count() - gtick;
double sec = reltik * 0.001;