Commit Graph

51 Commits

Author SHA1 Message Date
zico ad7cb106bc Changed custom D1X license to GPLv3 2014-06-01 19:55:23 +02:00
Kp 094dfbf3d4 Reduce header inclusions 2013-12-31 03:22:03 +00:00
Kp 073f00974a Eliminate uses of the typedef struct X { ... } X; pattern
C++ does not require this pattern.

import re, fileinput
to = re.compile(r'^typedef struct ([a-z_A-Z]+)\s*{')
tc = re.compile(r'^}(.*?)\s*([a-z_A-Z]+);$')
osn = None
for line in fileinput.input(inplace=True):
	m = to.match(line)
	if m:
		osn = m.group(1)
		print 'struct %s\n{' % osn
		continue
	if osn:
		m = tc.match(line)
		if m:
			csn = m.group(2)
			if osn == csn:
				print '}%s;' % m.group(1)
				osn = None
				continue
			else:
				osn = None
	print line,
2013-12-28 22:48:07 +00:00
Kp 58e740c0bd Remove unused declaration of Center_names 2013-12-22 20:56:35 +00:00
Kp f269ed7374 Make Been_visited a local bit array 2013-12-22 05:29:25 +00:00
Kp 9a7185f770 Store warning segments in countarray object 2013-12-22 05:27:16 +00:00
Kp a8e9f9f624 Store found segments in countarray object
Raise MAX_FOUND_SEGS to MAX_SEGMENTS to ease code reuse.
2013-12-22 01:54:15 +00:00
Kp c31c67c587 Store selected segments in countarray object 2013-12-22 01:54:15 +00:00
Kp 2f18c5037d Store group lists as countarray objects 2013-12-18 03:48:52 +00:00
Kp 3d79fe9b40 Use editor_status instead of editor_status_fmt where possible 2013-12-17 04:03:34 +00:00
Kp 9de54cfa74 Switch to C++ linkage
import fileinput
guard = 0
cxxguard = '#ifdef __cplusplus\n'
for line in fileinput.input(inplace=True):
	if line == cxxguard:
		guard = 1
		continue
	if guard:
		if line == 'extern "C" {\n':
			guard = 2
			continue
		if line == '}\n':
			guard = 0
			continue
		if guard == 2:
			assert(line == '#endif\n')
			guard = 0
			print cxxguard,
			continue
	print line,
2013-12-06 03:35:32 +00:00
Kp d626b6c3d4 Add include guard to kdefs.h 2013-12-01 00:53:22 +00:00
Kp 663d81cc8f Remove unused function med_rotate_segment_ang 2013-10-29 03:24:43 +00:00
Kp be777c78a3 Remove unused function med_copy_segment 2013-10-29 03:24:43 +00:00
Kp 8ed99faf5c Make headers freestanding 2013-10-26 03:50:28 +00:00
Kp 980621b9d4 Move similar/editor/med.c -> similar/editor/med.cpp 2012-11-17 06:14:09 +00:00
Kp 7de558490f Move similar/editor/kfuncs.c -> similar/editor/kfuncs.cpp 2012-11-17 06:14:09 +00:00
Kp 65b809b218 Move similar/editor/info.c -> similar/editor/info.cpp 2012-11-17 06:14:09 +00:00
Kp f95d401926 Move similar/editor/group.c -> similar/editor/group.cpp 2012-11-17 06:14:09 +00:00
Kp 2dddf084e0 Move similar/editor/eobject.c -> similar/editor/eobject.cpp 2013-10-05 23:10:44 +00:00
Kp 57a0b23ae4 Move similar/editor/elight.c -> similar/editor/elight.cpp 2013-10-05 23:09:01 +00:00
Kp 21c9e11811 Move similar/editor/centers.c -> similar/editor/centers.cpp 2013-10-05 23:07:23 +00:00
Kp 4db024f953 Move similar/main/gamesave.c -> similar/main/gamesave.cpp 2013-10-05 21:35:58 +00:00
Kp e5ee9b72f1 Move similar/main/aipath.c -> similar/main/aipath.cpp 2013-10-05 21:35:58 +00:00
Kp b4107e6526 Remove duplicate declarations 2013-10-03 03:11:52 +00:00
Kp c58c4e4d06 Move declarations to headers 2013-10-03 03:11:52 +00:00
Kp ff90315978 Use SConscript configure support to probe for format(printf) attribute 2013-07-27 22:17:13 +00:00
Kp 4577dd3977 Merge branch 'd2x-rebirth/master' into unification/master 2013-07-21 21:34:46 +00:00
Kp a1ba420031 Mark various parameters and variables as const 2013-07-20 23:12:24 +00:00
Kp 012d8e249b Merge branch d1x-rebirth/master into unification/master 2013-07-19 22:32:28 +00:00
Kp a4277df58f Merge branch 'unify-d2x-rebirth' into unify
Conflicts:
	SConstruct
	common/include/editor/editor.h
	d2x-rebirth/editor/ehostage.c
	d2x-rebirth/include/d_glob.h
	d2x-rebirth/include/d_io.h
	d2x-rebirth/main/desc_id.h
	d2x-rebirth/main/gamestat.h
	d2x-rebirth/main/link.bat
2013-03-31 17:24:44 +00:00
Kp 5c5618f671 Merge branch 'unify-d1x-rebirth' into unify
Conflicts:
	SConstruct
	common/main/vers_id.h
	d1x-rebirth/include/alloca.h
	d1x-rebirth/include/bcd.h
	d1x-rebirth/include/clipboard.h
	d1x-rebirth/include/compare.h
	d1x-rebirth/include/tracker/tracker.h
	d1x-rebirth/main/desc_id.h
	d1x-rebirth/main/script.h
2013-03-31 17:21:59 +00:00
Kp 9058a5c791 Move segment handling from editor.h 2013-03-17 23:01:32 +00:00
Kp ccd65b83ae Move */include/editor/eswitch.h -> common/include/editor/eswitch.h 2013-03-03 01:03:33 +00:00
Kp b732616404 Move */include/editor/kdefs.h -> common/include/editor/kdefs.h 2013-03-03 01:03:33 +00:00
Kp 923633b2ac Move */include/editor/texpage.h -> common/include/editor/texpage.h 2013-03-03 01:03:33 +00:00
Kp 0d2a2910e5 Move */include/editor/editor.h -> common/include/editor/editor.h 2013-03-03 01:03:33 +00:00
Kp 5b2b6b1975 Move */include/editor/centers.h -> common/include/editor/centers.h 2013-03-03 01:03:33 +00:00
Kp 4b4ff91172 Move */include/editor/ehostage.h -> common/include/editor/ehostage.h 2013-03-03 01:03:33 +00:00
Kp 69679eed12 Move */include/editor/eobject.h -> common/include/editor/eobject.h 2013-03-03 01:03:33 +00:00
Kp 5fbeb7c27b Move */include/editor/info.h -> common/include/editor/info.h 2013-03-03 01:03:33 +00:00
Kp 70c4a8ea0f Move */include/editor/kfuncs.h -> common/include/editor/kfuncs.h 2013-03-03 01:03:33 +00:00
Kp 1f6fdba458 Move */include/editor/macro.h -> common/include/editor/macro.h 2013-03-03 01:03:33 +00:00
Kp ce742086b5 Move */include/editor/meddraw.h -> common/include/editor/meddraw.h 2013-03-03 01:03:33 +00:00
Kp ca7947a7ce Move */include/editor/medlist.h -> common/include/editor/medlist.h 2013-03-03 01:03:33 +00:00
Kp f9cd5142dc Move */include/editor/medmisc.h -> common/include/editor/medmisc.h 2013-03-03 01:03:33 +00:00
Kp dff777bca7 Move */include/editor/medrobot.h -> common/include/editor/medrobot.h 2013-03-03 01:03:33 +00:00
Kp ba84aecf73 Move */include/editor/medsel.h -> common/include/editor/medsel.h 2013-03-03 01:03:33 +00:00
Kp 5499dd374b Move */include/editor/medwall.h -> common/include/editor/medwall.h 2013-03-03 01:03:33 +00:00
Kp e3885cb709 Move */include/editor/objpage.h -> common/include/editor/objpage.h 2013-03-03 01:03:33 +00:00