Cube  Check-in [9cb357d9b6]

Overview
Comment:Fix server segfaulting on start
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 9cb357d9b64250fcaa4badfd1f6ba6feb1bfc27a8a9e6375421e5fe46eceec24
User & Date: js on 2025-03-10 20:45:19
Other Links: manifest | tags
References
2025-03-10
20:46 Fixed ticket [fc37a51746]: Server segfaults on start plus 4 other changes artifact: 0fbd4ac5b1 user: js
Context
2025-03-10
20:52
Fix menu sorting check-in: e1c921ff76 user: js tags: trunk
20:45
Fix server segfaulting on start check-in: 9cb357d9b6 user: js tags: trunk
20:39
Fix player not moving on demo playback check-in: 57b9a0a9db user: js tags: trunk
Changes

Modified src/serverutil.mm from [89ca7e5bbf] to [195e0442e7].

156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
	return b;
}

int
main(int argc, char *argv[])
{
	int uprate = 0, maxcl = 4;
	char *sdesc = "", *ip = "", *master = NULL, *passwd = "";

	for (int i = 1; i < argc; i++) {
		char *a = &argv[i][2];
		if (argv[i][0] == '-')
			switch (argv[i][1]) {
			case 'u':
				uprate = atoi(a);







|







156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
	return b;
}

int
main(int argc, char *argv[])
{
	int uprate = 0, maxcl = 4;
	const char *sdesc = "", *ip = "", *master = NULL, *passwd = "";

	for (int i = 1; i < argc; i++) {
		char *a = &argv[i][2];
		if (argv[i][0] == '-')
			switch (argv[i][1]) {
			case 'u':
				uprate = atoi(a);
187
188
189
190
191
192
193
194

195
196
197
			default:
				printf("WARNING: unknown commandline option\n");
			}
	}

	if (enet_initialize() < 0)
		fatal(@"Unable to initialise network module");
	initserver(true, uprate, @(sdesc), @(ip), @(master), @(passwd), maxcl);

	return 0;
}
#endif







|
>



187
188
189
190
191
192
193
194
195
196
197
198
			default:
				printf("WARNING: unknown commandline option\n");
			}
	}

	if (enet_initialize() < 0)
		fatal(@"Unable to initialise network module");
	initserver(true, uprate, @(sdesc), @(ip),
	    (master != NULL ? @(master) : nil), @(passwd), maxcl);
	return 0;
}
#endif