TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
4541 commits 2 branches 28 tags 122 MiB
Commit graph

156 commits

Author SHA1 Message Date
Kp 4e6142d779 Move similar/arch/ogl/gr.c -> similar/arch/ogl/gr.cpp 2013-08-10 03:56:14 +00:00
Kp 9ba729ca3a Print function and line when calling Error 2013-08-09 02:10:51 +00:00
Kp 2cd7748e93 Convert vsprintf to vsnprintf 2013-08-09 01:58:17 +00:00
Kp a01dbc59d6 Make ui_messagebox_n static 2013-08-09 01:56:34 +00:00
Kp a881ee455e Remove fix.h 2013-08-08 03:01:48 +00:00
Kp c02a249263 Make gr_bitmap_scale_to static 2013-08-07 02:42:25 +00:00
Kp b81100d54d Make OGL_VIEWPORT static inline 2013-08-07 02:39:43 +00:00
Kp 1fdc080c17 Move common/ui/keypad.c -> common/ui/keypad.cpp 2013-08-04 17:59:37 +00:00
Kp 000774f49d Move common/ui/button.c -> common/ui/button.cpp 2013-08-04 17:57:20 +00:00
Kp 90b8cdbb1a Move common/misc/strio.c -> common/misc/strio.cpp 2013-08-04 17:56:05 +00:00
Kp 3e950a6b42 Move common/misc/ignorecase.c -> common/misc/ignorecase.cpp 2013-08-04 17:55:04 +00:00
Kp f8cb11d714 Move common/misc/hmp.c -> common/misc/hmp.cpp 2013-08-04 17:55:00 +00:00
Kp 09b1f8fab7 Move common/arch/sdl/window.c -> common/arch/sdl/window.cpp 2013-08-03 17:45:23 +00:00
Kp 97bea01c80 Move common/arch/sdl/rbaudio.c -> common/arch/sdl/rbaudio.cpp 2013-08-03 17:45:22 +00:00
Kp 9daacbdf81 Move common/arch/sdl/joy.c -> common/arch/sdl/joy.cpp 2013-08-03 17:45:22 +00:00
Kp eb65b73b2a Move common/3d/draw.c -> common/3d/draw.cpp 2013-08-03 17:45:22 +00:00
Kp 3c5c8a8068 Make arg processing static 2013-08-03 17:45:22 +00:00
Kp 69535df7fd Compile out memory checker if not enabled 2013-07-28 23:20:33 +00:00
Kp e961be1c14 u_mem: split memory debugging from NDEBUG 2013-07-28 23:18:44 +00:00
Kp adfbb4129d Move common/3d/clipper.c -> common/3d/clipper.cpp 2013-07-27 22:30:54 +00:00
Kp c80a824136 Move common/2d/line.c -> common/2d/line.cpp 2013-07-27 22:30:54 +00:00
Kp f7a030483f Move common/2d/bitmap.c -> common/2d/bitmap.cpp 2013-07-27 22:30:53 +00:00
Kp c2895e5176 Move common/2d/bitblt.c -> common/2d/bitblt.cpp 2013-07-27 22:30:53 +00:00
Kp ff90315978 Use SConscript configure support to probe for format(printf) attribute 2013-07-27 22:17:13 +00:00
Kp 74bcb86cf4 Remove some const modifiers that broke SDL-only build 2013-07-27 21:29:01 +00:00
Kp 2f4ffebde6 Add const markers to some texture mapping code 2013-07-27 21:28:53 +00:00
Kp 4187648621 Remove redundant/obsolete declarations 2013-07-21 21:55:00 +00:00
Kp dc84c7967f Remove use of enum forward declaration 
It is valid C99, but not valid C++03.
 2013-07-21 21:40:46 +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 02a32e2f42 Use u_int32_t for grs_screen sc_mode to avoid sign mismatch warnings 2013-07-19 02:40:13 +00:00
Kp 853713190d Make ogl_init_load_library static 2013-06-22 21:36:28 +00:00
Kp 9667abeaa7 Make d_splitpath const 2013-06-09 18:10:09 +00:00
Kp a10dbc7d4b Move 2d/2dsline.c -> 2d/2dsline.cpp 2012-11-11 22:12:51 +00:00
Kp 2e3159a15f Mark gr 2dsline functions static 2013-06-14 03:40:50 +00:00
Kp c69644dcf7 Wrap C++-incompatible statements with #ifndef __cplusplus 2013-06-14 03:40:50 +00:00
Kp 5648874a37 Merge branch d2x-rebirth/master into unification/master 2013-06-14 03:31:59 +00:00
Kp 22e31c0e8d Remove unused argument to clear_warn_func 2013-06-08 23:12:44 +00:00
Kp 997c35c351 Move */include/loadgl.h -> common/include/loadgl.h 2013-03-03 01:03:33 +00:00
Kp b87e7c2325 Merge branch 'd2x-rebirth/master' into unification/master 2013-06-02 20:14:42 +00:00
Kp 410b07d5c4 Merge branch 'd1x-rebirth/master' into unification/master 
Conflicts:
	SConstruct
 2013-05-05 22:08:34 +00:00
Kp 30c7274c17 Move d2x-rebirth/include/interp.h -> common/include/interp.h 
Prior to the Bazaar import, an unidentified committer moved some
function declarations from 3d.h to interp.h, but only for Descent II.
Replicate those changes in Descent I, and move the Descent II header
interp.h to become common.
 2013-03-03 01:03:33 +00:00
Kp 49046095f5 Move */*/hash.h -> common/include/hash.h 2013-03-03 01:03:33 +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 b14f7c2f5f Move */arch/ogl/gr.c -> similar/arch/ogl/gr.c 2013-03-17 23:01:31 +00:00
Kp 8979873ee8 Move */include/pcx.h -> similar/include/pcx.h 2013-03-17 23:01:31 +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 501f1d6a25 Move */include/ui.h -> common/include/ui.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
Kp a259ecf691 Move */include/editor/seguvs.h -> common/include/editor/seguvs.h 2013-03-03 01:03:33 +00:00
Kp 6d10818c40 Move */include/func.h -> common/include/func.h 2013-03-03 01:03:33 +00:00
Kp b2382d7772 Move */include/makesig.h -> common/include/makesig.h 2013-03-03 01:03:33 +00:00
Kp 70d4274106 Move */include/rbaudio.h -> common/include/rbaudio.h 2013-03-03 01:03:33 +00:00
Kp 1abda3c5a6 Move */include/strio.h -> common/include/strio.h 2013-03-03 01:03:33 +00:00
Kp c90750e802 Move */include/dl_list.h -> common/include/dl_list.h 2013-03-03 01:03:33 +00:00
Kp 972da8a7c7 Move */arch/include/window.h -> common/include/window.h 2013-03-03 01:03:33 +00:00
Kp 2ab85c0413 Move */arch/include/messagebox.h -> common/include/messagebox.h 2013-03-03 01:03:33 +00:00
Kp 0b38376ebd Move */arch/include/key.h -> common/include/key.h 2013-03-03 01:03:33 +00:00
Kp 536203188c Move */arch/include/jukebox.h -> common/include/jukebox.h 2013-03-03 01:03:33 +00:00
Kp 3becab2461 Move */include/texmap.h -> common/include/texmap.h 2013-03-03 01:03:33 +00:00
Kp 291e32b1e9 Move */include/3d.h -> common/include/3d.h 2013-03-03 01:03:33 +00:00
Kp daeada6d98 Move */include/palette.h -> common/include/palette.h 2013-03-03 01:03:33 +00:00
Kp 88b0cd1cf4 Move */include/ogl_init.h -> common/include/ogl_init.h 2013-03-03 01:03:33 +00:00
Kp 1633f29eab Move */include/grdef.h -> common/include/grdef.h 
Drop the special case for Metrowerks in Descent I.
 2013-03-03 01:03:33 +00:00
Kp 139ed37bc8 Move */include/gr.h -> common/include/gr.h 2013-03-03 01:03:33 +00:00
Kp 9a236566b8 Move */include/args.h -> common/include/args.h 2013-03-03 01:03:33 +00:00
Kp 0c2a08ec01 Move */include/physfsx.h -> common/include/physfsx.h 2013-03-03 01:03:33 +00:00
Kp 2afbfda4ee Move */include/ignorecase.h -> common/include/ignorecase.h 2013-03-03 01:03:33 +00:00
Kp a05d292255 Move */include/u_mem.h -> common/include/u_mem.h 
The Descent I reference to virtual_memory_on is unused, so drop it.
 2013-03-03 01:03:33 +00:00
Kp d9ee4c7dce Move */include/strutil.h -> common/include/strutil.h 2013-03-03 01:03:33 +00:00
Kp d99d197f8d Move */include/iff.h -> common/include/iff.h 2013-03-03 01:03:33 +00:00
Kp 781d4abdf2 Move */include/rle.h -> common/include/mouse.h 2013-03-03 01:03:33 +00:00
Kp 8298b3c7e6 Move */arch/include/mouse.h -> common/include/mouse.h 2013-03-03 01:03:33 +00:00
Kp 10260197f6 Move */arch/include/joy.h -> common/include/joy.h 2013-03-03 01:03:33 +00:00
Kp 896865c4c4 Move */arch/include/digi_mixer_music.h -> common/include/digi_mixer_music.h 2013-03-03 01:03:33 +00:00
Kp 94e1ee629a Move */arch/include/digi_mixer.h -> common/include/digi_mixer.h 2013-03-03 01:03:33 +00:00
Kp c6e0882f51 Move */arch/include/digi_audio.h -> common/include/digi_audio.h 2013-03-03 01:03:33 +00:00
Kp 27953049cf Move */arch/include/event.h -> common/include/event.h 2013-03-03 01:03:33 +00:00
Kp 9bc42c0b32 Move */include/timer.h -> common/include/timer.h 2013-03-03 01:03:33 +00:00
Kp f2fef2eef5 Move */include/byteswap.h -> common/include/byteswap.h 2013-03-03 01:03:33 +00:00
Kp 204b1e4700 Move */include/console.h -> common/include/console.h 2013-03-03 01:03:33 +00:00
Kp 6555abf09e Move */include/hmp.h -> common/include/hmp.h 2013-03-03 01:03:33 +00:00