projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added separate network info structure for network options and setup values
[rocksndiamonds.git]
/
src
/
libgame
/
setup.c
diff --git
a/src/libgame/setup.c
b/src/libgame/setup.c
index bbfbe9c3d9063057f2d044e94e2401111705a550..1d5a83bfffabcc9c064861e4c20c6ad292026282 100644
(file)
--- a/
src/libgame/setup.c
+++ b/
src/libgame/setup.c
@@
-1575,7
+1575,7
@@
char *getCookie(char *file_type)
sprintf(cookie, "%s_%s_FILE_VERSION_%d.%d",
program.cookie_prefix, file_type,
sprintf(cookie, "%s_%s_FILE_VERSION_%d.%d",
program.cookie_prefix, file_type,
- program.version_
major, program.version_min
or);
+ program.version_
super, program.version_maj
or);
return cookie;
}
return cookie;
}
@@
-1600,7
+1600,7
@@
int getFileVersionFromCookieString(const char *cookie)
const int len_pattern1 = strlen(pattern1);
const int len_pattern2 = strlen(pattern2);
const int len_pattern = len_pattern1 + len_pattern2;
const int len_pattern1 = strlen(pattern1);
const int len_pattern2 = strlen(pattern2);
const int len_pattern = len_pattern1 + len_pattern2;
- int version_
major, version_min
or;
+ int version_
super, version_maj
or;
if (len_cookie <= len_pattern)
return -1;
if (len_cookie <= len_pattern)
return -1;
@@
-1616,10
+1616,10
@@
int getFileVersionFromCookieString(const char *cookie)
ptr_cookie2[2] < '0' || ptr_cookie2[2] > '9')
return -1;
ptr_cookie2[2] < '0' || ptr_cookie2[2] > '9')
return -1;
- version_
majo
r = ptr_cookie2[0] - '0';
- version_m
in
or = ptr_cookie2[2] - '0';
+ version_
supe
r = ptr_cookie2[0] - '0';
+ version_m
aj
or = ptr_cookie2[2] - '0';
- return VERSION_IDENT(version_
major, version_min
or, 0, 0);
+ return VERSION_IDENT(version_
super, version_maj
or, 0, 0);
}
boolean checkCookieString(const char *cookie, const char *template)
}
boolean checkCookieString(const char *cookie, const char *template)
@@
-2629,6
+2629,10
@@
void setSetupInfo(struct TokenInfo *token_info,
*(char **)setup_value = getStringCopy(token_value);
break;
*(char **)setup_value = getStringCopy(token_value);
break;
+ case TYPE_PLAYER:
+ *(int *)setup_value = get_player_nr_from_string(token_value);
+ break;
+
default:
break;
}
default:
break;
}
@@
-3872,6
+3876,10
@@
char *getSetupValue(int type, void *value)
strcpy(value_string, *(char **)value);
break;
strcpy(value_string, *(char **)value);
break;
+ case TYPE_PLAYER:
+ sprintf(value_string, "player_%d", *(int *)value + 1);
+ break;
+
default:
value_string[0] = '\0';
break;
default:
value_string[0] = '\0';
break;