Commit graph

135 commits

Author SHA1 Message Date
helixhorned
0f35221820 Prettify some code where I felt was necessary.
git-svn-id: https://svn.eduke32.com/eduke32@3127 1a8010ca-5511-0410-912e-c29ae57300e0
2012-11-06 23:06:44 +00:00
helixhorned
c429f3fbc4 Clean up control.c.
- Remove everything using CONTROL_KeyMapping, which was only written to.
- Remove unused functions, make local ones static.
- Remove private function declarations in _control.h.

git-svn-id: https://svn.eduke32.com/eduke32@3124 1a8010ca-5511-0410-912e-c29ae57300e0
2012-11-06 23:06:34 +00:00
hendricks266
fcf9beae6a Work-in-progress adjustment to the C code to compile under C++. It builds for me without errors using Win32 MinGW-GCC, but it still generates warning soup. No guarantees about MSVC or anything using SDL. Enable C++ by building with CPLUSPLUS=1. C remains the default and should compile with no change in setup.
Credit to Plagman for the idea and doing the work on the game side, which is included in this commit.

(Building as C++ will give us features with which we can make improvements and optimizations on the multiplayer code and Polymer.)

git-svn-id: https://svn.eduke32.com/eduke32@3116 1a8010ca-5511-0410-912e-c29ae57300e0
2012-11-05 02:49:08 +00:00
hendricks266
132aebf1c1 patch from jfmact: "added c++ trimming to header" mathutil.h
git-svn-id: https://svn.eduke32.com/eduke32@3016 1a8010ca-5511-0410-912e-c29ae57300e0
2012-09-13 07:06:47 +00:00
helixhorned
7807f35691 control layer: comment out some unused functions and stuff.
git-svn-id: https://svn.eduke32.com/eduke32@2940 1a8010ca-5511-0410-912e-c29ae57300e0
2012-08-20 21:24:54 +00:00
helixhorned
bdedbc6f76 Constify various char* vars, parameters, etc. for more -Wwrite-strings cleanness
-Wwrite-strings is useful to detect code where string literals and e.g. alloc'd
strings are used side-by-side, potentially creating dangerous situations, or to
find uses of old, non-constified APIs.  However, enabling it would still flood
the log with too many warnings.  Also, GCC wrongly warns for initializations of
char arrays.

git-svn-id: https://svn.eduke32.com/eduke32@2796 1a8010ca-5511-0410-912e-c29ae57300e0
2012-07-01 22:11:33 +00:00
hendricks266
d3a3c74112 Massive menu input control revamp/cleanup/factor. (added: input.[ch])
New Wii control defaults for the Wii Remote + Nunchuk and the Classic Controller. This includes new code added just so that the Home key brings up the menu in-game, reducing the need for a USB keyboard.

On the technical side, raw joystick access (comparable to what is available for keyboard and mouse) is now present in jmact, on the game side. (added: joystick.[ch])

Using this new raw joystick access, I replaced tueidj's hack to map A and B to LMB/RMB and D-Pad Up/Down to the scrollwheel.

I made the menus more friendly to mouse and joystick browsing by adding and unifying checks and clears for various buttons and gamefuncs. In fact, the majority of the time spent on this commit was tracking down problems that appeared with the factoring and trying to understand the menu system and the way input checks are precariously executed.

In addition, "Press any key or button to continue" now truly means what it says.

As a result of incorporating proper raw access into control.c instead of it directly accessing the implementaiton, the program *may* no longer be affected by joystick input when it is out of focus. This follows the pattern set by the mouse, and I think this is a positive change.

A small bonus: In the classic/old keyboard preset, the key for Show_Console has been changed from '`' to 'C' because '`' is taken by Quick_Kick.

git-svn-id: https://svn.eduke32.com/eduke32@2728 1a8010ca-5511-0410-912e-c29ae57300e0
2012-06-03 16:11:22 +00:00
terminx
f3c009b146 Replace a couple uses of S_IREAD with our platform-aware BS_IREAD
git-svn-id: https://svn.eduke32.com/eduke32@2720 1a8010ca-5511-0410-912e-c29ae57300e0
2012-06-02 00:02:57 +00:00
terminx
1c1da97378 WIP multiplayer changes, still completely broken.
git-svn-id: https://svn.eduke32.com/eduke32@2664 1a8010ca-5511-0410-912e-c29ae57300e0
2012-05-17 23:54:43 +00:00
helixhorned
1bb6fb5cd4 Patch adding Wii support by tueidj, part 11: miscellaneous changes
- BIGX -> BIGX_, likely again because of a name clash
- make a loop in animlib.c iterate in forward direction

git-svn-id: https://svn.eduke32.com/eduke32@2631 1a8010ca-5511-0410-912e-c29ae57300e0
2012-05-01 12:41:13 +00:00
helixhorned
a1d3c2dcea Patch adding Wii support by tueidj, part 4: joystick support
- sdlayer.c: custom "get joystick button names" routine
- jmact/mouse.c: packs some joystick events into the value returned by
  MOUSE_GetButtons(): bits used are 256, 512, 4096, 8192
- MOUSE_Init() --> Mouse_Init(), presumably because of a name clash?
- comments out right-shift of joystick analog values by 5, maybe this fixes
  the scale problems with the joystick on the PC too?

git-svn-id: https://svn.eduke32.com/eduke32@2624 1a8010ca-5511-0410-912e-c29ae57300e0
2012-05-01 12:38:43 +00:00
hendricks266
858746d081 Fix JonoF's email address.
git-svn-id: https://svn.eduke32.com/eduke32@2456 1a8010ca-5511-0410-912e-c29ae57300e0
2012-03-12 04:47:04 +00:00
helixhorned
09addc955c jmact/control.c: rewrite strange looking loop.
git-svn-id: https://svn.eduke32.com/eduke32@2334 1a8010ca-5511-0410-912e-c29ae57300e0
2012-02-11 11:52:33 +00:00
helixhorned
793aadebc5 Janitorial work part 2, perfect for a rainy day. This fixes a lot of leaks, both on the client side as well as for memory allocated by OpenGL. If you had crashes after a few times of restartvid'ing in Polymer, this should fix it.
git-svn-id: https://svn.eduke32.com/eduke32@1942 1a8010ca-5511-0410-912e-c29ae57300e0
2011-07-22 22:00:53 +00:00
helixhorned
24dcfc6633 Make smostcnt an int32 to prevent overflow (and subsequent crash) with too many saved positions; In Mapster, make it possible to bunch-join an extended with a non-extended floor inner to the first one, so that inner sectors created out of loops can be deleted by joining the sectors then.
git-svn-id: https://svn.eduke32.com/eduke32@1932 1a8010ca-5511-0410-912e-c29ae57300e0
2011-07-13 16:42:29 +00:00
helixhorned
dd355636ff A couple of OSX fixes: one 64-bit cleanup, compilation fix on ppc (is that ever used?), nasm command line fix for x86
git-svn-id: https://svn.eduke32.com/eduke32@1903 1a8010ca-5511-0410-912e-c29ae57300e0
2011-06-15 10:38:12 +00:00
helixhorned
92223c2c85 Atrributify various function declarations. Right now the attributes used are noreturn, nonnull and format, the latter allowing us to catch silly printf errors. Again, these range from relatively benign to disastrous.
git-svn-id: https://svn.eduke32.com/eduke32@1740 1a8010ca-5511-0410-912e-c29ae57300e0
2010-12-19 22:47:10 +00:00
terminx
1102b74a35 mostly multiplayer fixes among other things
git-svn-id: https://svn.eduke32.com/eduke32@1672 1a8010ca-5511-0410-912e-c29ae57300e0
2010-07-19 15:14:00 +00:00
terminx
9143833fc8 rotatesprite and multivoc have a rape baby
No, seriously.  Adds widescreen aware rotatesprite and works out half a dozen huge problems in the sound system, among other things.


git-svn-id: https://svn.eduke32.com/eduke32@1658 1a8010ca-5511-0410-912e-c29ae57300e0
2010-06-22 21:50:01 +00:00
terminx
a6b614f6bf fix mouse positioning issue when using alt+tab on win32 and fix game speed at low framerates
git-svn-id: https://svn.eduke32.com/eduke32@1633 1a8010ca-5511-0410-912e-c29ae57300e0
2010-05-08 20:15:24 +00:00
terminx
bb21e1c05f Fixes anim playback, mouse lag with low fps, keyboard setup menu
git-svn-id: https://svn.eduke32.com/eduke32@1632 1a8010ca-5511-0410-912e-c29ae57300e0
2010-05-07 20:45:40 +00:00
terminx
45d93544a6 Source code "cleanup," herein referred to as "rape"
git-svn-id: https://svn.eduke32.com/eduke32@1625 1a8010ca-5511-0410-912e-c29ae57300e0
2010-05-02 23:27:30 +00:00
terminx
1fe4cfb36f git-svn-id: https://svn.eduke32.com/eduke32@1618 1a8010ca-5511-0410-912e-c29ae57300e0 2010-03-17 07:40:13 +00:00
terminx
e7f91d9b84 further animlib improvements... like the previous commits, this probably speeds up playback of giant .anm files on very slow systems (handhelds like the Dingoo, etc)
git-svn-id: https://svn.eduke32.com/eduke32@1617 1a8010ca-5511-0410-912e-c29ae57300e0
2010-03-15 00:06:48 +00:00
terminx
3515f603af git-svn-id: https://svn.eduke32.com/eduke32@1615 1a8010ca-5511-0410-912e-c29ae57300e0 2010-03-14 11:42:13 +00:00
terminx
150678ce7b git-svn-id: https://svn.eduke32.com/eduke32@1614 1a8010ca-5511-0410-912e-c29ae57300e0 2010-03-14 11:15:53 +00:00
terminx
44575d7e2c Ball-busting true client-server multiplayer prototype/alpha/whatever
git-svn-id: https://svn.eduke32.com/eduke32@1552 1a8010ca-5511-0410-912e-c29ae57300e0
2009-12-05 09:22:43 +00:00
terminx
20c028b2e9 Memory cleanups, use Bm/c/realloc/free everywhere (configured as nedmalloc version in compat.h), add large page support for Vista/7, tweak nedmalloc settings, add support for projecting textures from SE50 spotlights placed in maps via sprite owner member (manipulated through CONs via sprite htpicnum member), fix building Mapster32 with MSVC, increase PR_MAXLIGHTS to 1024
git-svn-id: https://svn.eduke32.com/eduke32@1527 1a8010ca-5511-0410-912e-c29ae57300e0
2009-10-07 06:47:35 +00:00
terminx
fe6e27e819 Use C versions of divscale##() instead of asm to work around an overflow with drawmapview(), get rid of leftover custom 'int64' type in favor of int64_t, other minor fixes
git-svn-id: https://svn.eduke32.com/eduke32@1492 1a8010ca-5511-0410-912e-c29ae57300e0
2009-09-09 07:19:14 +00:00
terminx
3aaab4b63d Remove dead copy protection and watcom support code, fix structure alignment and packing issues preventing Polymer from working with MSVC, enable link time code generation (whole program optimization) for MSVC builds, fix most warnings showing up in MSVC with /w2, add pulsating dynamic lights when holding the shrinker or expander
git-svn-id: https://svn.eduke32.com/eduke32@1454 1a8010ca-5511-0410-912e-c29ae57300e0
2009-07-09 02:29:48 +00:00
terminx
2f86c2a20f Cleaning out tree... some light changes, polymer memory pools, some meaningless optimizations, etc
git-svn-id: https://svn.eduke32.com/eduke32@1425 1a8010ca-5511-0410-912e-c29ae57300e0
2009-06-09 06:19:58 +00:00
terminx
af5128bcdd MSVC fixes + clean out tree
git-svn-id: https://svn.eduke32.com/eduke32@1399 1a8010ca-5511-0410-912e-c29ae57300e0
2009-06-05 20:09:13 +00:00
terminx
30a649c86f Some more cvar stuff
git-svn-id: https://svn.eduke32.com/eduke32@1355 1a8010ca-5511-0410-912e-c29ae57300e0
2009-04-29 19:43:51 +00:00
terminx
7c036eb073 Remove jmact/types.h in favor of standardized inttypes.h stuff
git-svn-id: https://svn.eduke32.com/eduke32@1346 1a8010ca-5511-0410-912e-c29ae57300e0
2009-04-26 05:57:42 +00:00
terminx
768f3ad6d6 git-svn-id: https://svn.eduke32.com/eduke32@1221 1a8010ca-5511-0410-912e-c29ae57300e0 2009-02-02 01:49:14 +00:00
terminx
8f0b228f1a clean out tree
git-svn-id: https://svn.eduke32.com/eduke32@1220 1a8010ca-5511-0410-912e-c29ae57300e0
2009-01-31 00:02:14 +00:00
terminx
9095a4911d git-svn-id: https://svn.eduke32.com/eduke32@1206 1a8010ca-5511-0410-912e-c29ae57300e0 2009-01-10 07:38:50 +00:00
terminx
d6914ed108 ass rape
git-svn-id: https://svn.eduke32.com/eduke32@1205 1a8010ca-5511-0410-912e-c29ae57300e0
2009-01-09 09:29:17 +00:00
terminx
a8451444ef git-svn-id: https://svn.eduke32.com/eduke32@1190 1a8010ca-5511-0410-912e-c29ae57300e0 2008-12-23 23:27:53 +00:00
terminx
a34a4901a9 git-svn-id: https://svn.eduke32.com/eduke32@1144 1a8010ca-5511-0410-912e-c29ae57300e0 2008-11-21 12:14:05 +00:00
terminx
4910928877 source code rape
git-svn-id: https://svn.eduke32.com/eduke32@1143 1a8010ca-5511-0410-912e-c29ae57300e0
2008-11-20 14:06:36 +00:00
terminx
54128e127c Enet networking patch from a random dude on IRC, with the addition of my own port of the "unstable" networking code from duke3d_w32 (which is what is actually used in Internet play)
git-svn-id: https://svn.eduke32.com/eduke32@1124 1a8010ca-5511-0410-912e-c29ae57300e0
2008-11-11 13:24:05 +00:00
terminx
4efb91b376 git-svn-id: https://svn.eduke32.com/eduke32@1121 1a8010ca-5511-0410-912e-c29ae57300e0 2008-11-05 11:49:13 +00:00
terminx
60a4224533 Some mouse changes... previous effect of the "mouse smoothing" menu option is now mandatory (since turning it off just means you'll lose input from tiny movements), new "mouse smoothing" effect is a more traditional average of the last 2 times the mouse input was read
git-svn-id: https://svn.eduke32.com/eduke32@1099 1a8010ca-5511-0410-912e-c29ae57300e0
2008-10-13 01:16:40 +00:00
terminx
8dc599fc28 git-svn-id: https://svn.eduke32.com/eduke32@1089 1a8010ca-5511-0410-912e-c29ae57300e0 2008-10-05 09:23:55 +00:00
terminx
07b71b1139 git-svn-id: https://svn.eduke32.com/eduke32@1023 1a8010ca-5511-0410-912e-c29ae57300e0 2008-08-24 23:24:14 +00:00
terminx
553658aa67 git-svn-id: https://svn.eduke32.com/eduke32@1018 1a8010ca-5511-0410-912e-c29ae57300e0 2008-08-24 09:01:17 +00:00
terminx
52bb6e84c9 git-svn-id: https://svn.eduke32.com/eduke32@1017 1a8010ca-5511-0410-912e-c29ae57300e0 2008-08-24 06:17:09 +00:00
terminx
57c3cea591 git-svn-id: https://svn.eduke32.com/eduke32@1016 1a8010ca-5511-0410-912e-c29ae57300e0 2008-08-24 06:06:04 +00:00
terminx
b58833d730 git-svn-id: https://svn.eduke32.com/eduke32@1015 1a8010ca-5511-0410-912e-c29ae57300e0 2008-08-24 05:39:28 +00:00
terminx
cf2f7927ea Believe it or not, this actually consistently gave me a few fps in my test scenario
git-svn-id: https://svn.eduke32.com/eduke32@1014 1a8010ca-5511-0410-912e-c29ae57300e0
2008-08-24 04:55:57 +00:00
terminx
4ad4350d48 Line numbering stuff... this still needs work
git-svn-id: https://svn.eduke32.com/eduke32@976 1a8010ca-5511-0410-912e-c29ae57300e0
2008-08-16 07:53:29 +00:00
terminx
ca0987d715 git-svn-id: https://svn.eduke32.com/eduke32@950 1a8010ca-5511-0410-912e-c29ae57300e0 2008-08-09 10:42:16 +00:00
terminx
3f9daa6c44 git-svn-id: https://svn.eduke32.com/eduke32@949 1a8010ca-5511-0410-912e-c29ae57300e0 2008-08-09 10:16:18 +00:00
terminx
5ce5b287fa git-svn-id: https://svn.eduke32.com/eduke32@855 1a8010ca-5511-0410-912e-c29ae57300e0 2008-07-12 23:44:07 +00:00
terminx
4ddfc3e9d9 Comment out and refactor some unnecessary (IMO) console startup messages... seems to improve win32 startup times, possibly due to less scrolling of the startup window text buffer.
git-svn-id: https://svn.eduke32.com/eduke32@848 1a8010ca-5511-0410-912e-c29ae57300e0
2008-07-09 23:25:38 +00:00
terminx
13d4b6fb14 More bind shit
git-svn-id: https://svn.eduke32.com/eduke32@834 1a8010ca-5511-0410-912e-c29ae57300e0
2008-07-03 07:37:41 +00:00
terminx
95eed1cd2b mouse binds
git-svn-id: https://svn.eduke32.com/eduke32@826 1a8010ca-5511-0410-912e-c29ae57300e0
2008-06-30 19:06:05 +00:00
terminx
ef2683418e Keyboard configuration menu <-> binds
git-svn-id: https://svn.eduke32.com/eduke32@822 1a8010ca-5511-0410-912e-c29ae57300e0
2008-06-30 09:00:33 +00:00
terminx
1783253ccd git-svn-id: https://svn.eduke32.com/eduke32@821 1a8010ca-5511-0410-912e-c29ae57300e0 2008-06-30 07:30:48 +00:00
terminx
ef183706e6 read/write binds to/from binds.cfg
git-svn-id: https://svn.eduke32.com/eduke32@813 1a8010ca-5511-0410-912e-c29ae57300e0
2008-06-29 12:29:42 +00:00
terminx
3c51265878 Formatting changes to jmact
git-svn-id: https://svn.eduke32.com/eduke32@809 1a8010ca-5511-0410-912e-c29ae57300e0
2008-06-29 10:41:01 +00:00
terminx
2fa3153a84 Better keybinding... still needs some work but seems to be functional
Example:

bind w repeat gamefunc_move_forward
bind s repeat gamefunc_move_backward
bind a repeat gamefunc_strafe_left
bind d repeat gamefunc_strafe_right
bind space gamefunc_jump
bind leftcontrol repeat gamefunc_crouch
bind f12 quit



git-svn-id: https://svn.eduke32.com/eduke32@808 1a8010ca-5511-0410-912e-c29ae57300e0
2008-06-29 10:40:37 +00:00
terminx
408ca47fbd git-svn-id: https://svn.eduke32.com/eduke32@654 1a8010ca-5511-0410-912e-c29ae57300e0 2008-03-22 10:23:57 +00:00
terminx
945e1b2357 Remove -Wno-unused from Makefile
git-svn-id: https://svn.eduke32.com/eduke32@649 1a8010ca-5511-0410-912e-c29ae57300e0
2008-03-21 04:01:38 +00:00
terminx
31a901b7eb git-svn-id: https://svn.eduke32.com/eduke32@584 1a8010ca-5511-0410-912e-c29ae57300e0 2007-12-12 17:42:14 +00:00
terminx
4e0f8281c7 git-svn-id: https://svn.eduke32.com/eduke32@556 1a8010ca-5511-0410-912e-c29ae57300e0 2007-08-17 03:16:46 +00:00
terminx
ef81aee7be The mouse wheel was backwards on Win32... I think this fixes that.
git-svn-id: https://svn.eduke32.com/eduke32@478 1a8010ca-5511-0410-912e-c29ae57300e0
2007-01-29 03:21:12 +00:00
Plagman
87556300bf EDuke32 now compiles okay with the Microsoft compiler using NMake.
git-svn-id: https://svn.eduke32.com/eduke32@434 1a8010ca-5511-0410-912e-c29ae57300e0
2006-12-21 12:53:11 +00:00
terminx
3d867963b9 Support for a version string to stick in the lower right hand corner of the OSD
git-svn-id: https://svn.eduke32.com/eduke32@403 1a8010ca-5511-0410-912e-c29ae57300e0
2006-12-11 04:38:10 +00:00
terminx
c4147db020 Blah blah blah
git-svn-id: https://svn.eduke32.com/eduke32@400 1a8010ca-5511-0410-912e-c29ae57300e0
2006-12-10 21:53:33 +00:00
terminx
65dc97d55b More warning fixes
git-svn-id: https://svn.eduke32.com/eduke32@349 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-19 03:02:36 +00:00
terminx
80c51ac2de Fix some gcc4 warnings
git-svn-id: https://svn.eduke32.com/eduke32@344 1a8010ca-5511-0410-912e-c29ae57300e0
2006-11-18 08:13:33 +00:00
terminx
11e8db76a8 Fix from JonoF for using a joystick in combination with SDLayer.
git-svn-id: https://svn.eduke32.com/eduke32@289 1a8010ca-5511-0410-912e-c29ae57300e0
2006-09-02 02:34:29 +00:00
terminx
4918ba6fde Formatting fixes for build.c, config.c, engine.c and polymost.c plus some warning fixes from JonoF and some cfg file reading changes for the game
git-svn-id: https://svn.eduke32.com/eduke32@248 1a8010ca-5511-0410-912e-c29ae57300e0
2006-07-24 02:47:47 +00:00
terminx
1bab48f5be Cleaning out the tree
git-svn-id: https://svn.eduke32.com/eduke32@185 1a8010ca-5511-0410-912e-c29ae57300e0
2006-05-30 06:14:25 +00:00
terminx
c6e003ee9b Input changes from JonoF
git-svn-id: https://svn.eduke32.com/eduke32@171 1a8010ca-5511-0410-912e-c29ae57300e0
2006-05-17 03:13:39 +00:00
terminx
2f99dd111b Increase vertical aiming precision
git-svn-id: https://svn.eduke32.com/eduke32@142 1a8010ca-5511-0410-912e-c29ae57300e0
2006-05-02 21:36:09 +00:00
terminx
aa042016b7 Better mouse movement
git-svn-id: https://svn.eduke32.com/eduke32@127 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-30 00:40:41 +00:00
terminx
76af69d72d Mouse aim fixes
git-svn-id: https://svn.eduke32.com/eduke32@123 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-29 06:06:30 +00:00
terminx
2455734c76 Cleanups
git-svn-id: https://svn.eduke32.com/eduke32@91 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-22 22:33:52 +00:00
terminx
f296ec24e5 Misc changes
git-svn-id: https://svn.eduke32.com/eduke32@11 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-15 03:12:08 +00:00
Plagman
09f0c239b6 Importing source for great justice
git-svn-id: https://svn.eduke32.com/eduke32@5 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-13 20:47:06 +00:00
Plagman
c9e58ed4e5 Removed file/folder
git-svn-id: https://svn.eduke32.com/eduke32@3 1a8010ca-5511-0410-912e-c29ae57300e0
2006-04-13 20:43:19 +00:00
Plagman
d7c9b7db00 git-svn-id: https://svn.eduke32.com/eduke32@2 1a8010ca-5511-0410-912e-c29ae57300e0 2006-04-13 20:34:38 +00:00