Cube  Check-in [4391eeb535]

Overview
Comment:A few minor fixes
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 4391eeb53583c55fc48bc91289308057d936c6e52807e1f080c70a0c6c064079
User & Date: js on 2024-07-20 16:45:18
Other Links: manifest | tags
Context
2024-07-20
21:49
Fix needing -fpermissive check-in: bd82b5a5b1 user: js tags: trunk
16:45
A few minor fixes check-in: 4391eeb535 user: js tags: trunk
15:08
Run clang-format on the entire codebase check-in: 0a0d4f9155 user: js tags: trunk
Changes

Modified .fossil-settings/ignore-glob from [ac8291d999] to [bc24f2516f].

1
2
3
4

5
6
7
8
9
10
11
*.a
*.dep
*.o
*/.deps

aclocal.m4
autom4te.cache
buildsys.mk
config.cfg
config.log
config.status
configure




>







1
2
3
4
5
6
7
8
9
10
11
12
*.a
*.dep
*.o
*/.deps
.deps
aclocal.m4
autom4te.cache
buildsys.mk
config.cfg
config.log
config.status
configure

Modified src/Makefile from [a5f2d16630] to [ffd34fa226].

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
PROG = client

SRCS = client.o			\
       clientextras.o		\
       clientgame.o		\
       clients2c.o		\
       command.o		\
       console.o		\
       editing.o		\
       entities.o		\
       main.o			\
       menus.o			\
       monster.o		\
       physics.o		\
       rendercubes.o		\
       renderextras.o		\
       rendergl.o		\
       rendermd2.o		\
       renderparticles.o	\
       rendertext.o		\
       rndmap.o			\
       savegamedemo.o		\
       server.o			\
       serverbrowser.o		\
       serverms.o		\
       serverutil.o		\
       sound.o			\
       tools.o			\
       weapon.o			\
       world.o			\
       worldio.o		\
       worldlight.o		\
       worldocull.o		\
       worldrender.o

include ../buildsys.mk
include ../extra.mk

CPPFLAGS += -I../enet/include	\
	    ${SDL_CFLAGS}	\
	    ${GL_CFLAGS}	\


|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|







1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
PROG = client

SRCS = client.cxx		\
       clientextras.cxx		\
       clientgame.cxx		\
       clients2c.cxx		\
       command.cxx		\
       console.cxx		\
       editing.cxx		\
       entities.cxx		\
       main.cxx			\
       menus.cxx		\
       monster.cxx		\
       physics.cxx		\
       rendercubes.cxx		\
       renderextras.cxx		\
       rendergl.cxx		\
       rendermd2.cxx		\
       renderparticles.cxx	\
       rendertext.cxx		\
       rndmap.cxx		\
       savegamedemo.cxx		\
       server.cxx		\
       serverbrowser.cxx	\
       serverms.cxx		\
       serverutil.cxx		\
       sound.cxx		\
       tools.cxx		\
       weapon.cxx		\
       world.cxx		\
       worldio.cxx		\
       worldlight.cxx		\
       worldocull.cxx		\
       worldrender.cxx

include ../buildsys.mk
include ../extra.mk

CPPFLAGS += -I../enet/include	\
	    ${SDL_CFLAGS}	\
	    ${GL_CFLAGS}	\

Modified src/tools.h from [9188f1112b] to [5a12c43f73].

182
183
184
185
186
187
188


189
190
191
192
193
194
195
	{
		return string(s, _MAXDEFSTR - 1);
	};

	void dealloc_block(void *b);
	void allocnext(size_t allocsize);
};



template <class T> struct vector {
	T *buf;
	int alen;
	int ulen;
	pool *p;








>
>







182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
	{
		return string(s, _MAXDEFSTR - 1);
	};

	void dealloc_block(void *b);
	void allocnext(size_t allocsize);
};

pool *gp();

template <class T> struct vector {
	T *buf;
	int alen;
	int ulen;
	pool *p;

372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
	loopi(ht->size) for (ht->enumc = ht->table[i]; ht->enumc;              \
	                     ht->enumc = ht->enumc->next)                      \
	{                                                                      \
		t e = &ht->enumc->data;                                        \
		b;                                                             \
	}

pool *gp();
inline char *
newstring(char *s)
{
	return gp()->string(s);
};
inline char *
newstring(char *s, size_t l)







<







374
375
376
377
378
379
380

381
382
383
384
385
386
387
	loopi(ht->size) for (ht->enumc = ht->table[i]; ht->enumc;              \
	                     ht->enumc = ht->enumc->next)                      \
	{                                                                      \
		t e = &ht->enumc->data;                                        \
		b;                                                             \
	}


inline char *
newstring(char *s)
{
	return gp()->string(s);
};
inline char *
newstring(char *s, size_t l)