Kevin Shanahan
8af4338acf
render: shadow currententity with a local in R_DrawCulledPolys
...
Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
2012-10-22 11:27:59 +10:30
Kevin Shanahan
ac32c7c3f2
render: pass currententity down to R_RenderPoly
...
Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
2012-10-22 11:25:43 +10:30
Kevin Shanahan
ab23ab9ad8
render: pass currententity down to R_RenderBmodelFace
...
Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
2012-10-22 11:18:47 +10:30
Kevin Shanahan
4fe87926ef
render: pass currententity down to R_RenderFace
...
Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
2012-10-22 11:14:17 +10:30
Kevin Shanahan
08901a1d85
render: shadow currententity with a local in D_DrawSurfaces
...
Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
2012-10-22 11:07:32 +10:30
Kevin Shanahan
3f159b8285
render: pass currententity down to D_CacheSurface
...
Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
2012-10-22 10:57:06 +10:30
Kevin Shanahan
c0e089a770
render: pass currententity down to R_BmodelCheckBBox
...
Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
2012-10-22 10:51:03 +10:30
Kevin Shanahan
36cc8afcfd
render: clean up local use of currententity in r_main.c
...
Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
2012-10-22 10:50:23 +10:30
Kevin Shanahan
f22338ea60
render: pass currententity down to R_AliasDrawModel
...
Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
2012-10-22 10:33:22 +10:30
Kevin Shanahan
e23d5a24ff
render: pass currententity down to R_AliasSetupFrame
...
Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
2012-10-22 10:27:22 +10:30
Kevin Shanahan
4b32782588
render: pass currententity down to R_AliasSetupSkin
...
Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
2012-10-22 10:21:43 +10:30
Kevin Shanahan
3116f2bc4f
render: pass currententity down to R_AliasSetUpTransform
...
Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
2012-10-22 10:19:27 +10:30
Kevin Shanahan
bda5e3718e
render: pass currententity down to R_AliasCheckBBox
...
Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
2012-10-22 10:06:50 +10:30
Kevin Shanahan
64684ace78
render: Clean up remaining local use of currententity in gl_rmain.c
...
Use a local variable in the local functions, but keep setting the
global as well for now, until I can be certain all side-effects have
been eliminated.
Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
2012-10-22 09:55:26 +10:30
Kevin Shanahan
9d8fbe3cd2
render: currententity is already passed to R_DrawAliasModel
...
Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
2012-10-22 09:48:23 +10:30
Kevin Shanahan
bdd842e97e
render: pass currententity down to GL_DrawAliasShadow
...
Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
2012-10-22 09:10:37 +10:30
Kevin Shanahan
6f8d31f415
render: currententity is already passed to R_DrawSpriteModel
...
Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
2012-10-22 08:57:59 +10:30
Kevin Shanahan
dd917b4648
render: rename function param that overrides global
...
Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
2012-10-22 08:55:33 +10:30
Kevin Shanahan
045e234d72
surf: Pass currententity down into R_TextureAnimation
...
Remove dependence on global "currententity"
Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
2012-10-21 20:19:16 +10:30
Kevin Shanahan
8840d2873c
move r_main.c to the common directory
...
Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
2012-10-21 18:20:31 +10:30
Kevin Shanahan
6c544900a8
merge trivial differences between r_main implementations
...
Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
2012-10-21 18:19:58 +10:30
Kevin Shanahan
3f57f304ed
nq: settle on default r_graphheight value of 15
...
Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
2012-10-21 18:16:38 +10:30
Kevin Shanahan
37b142f506
efrags: sw and gl can now share common implementation
...
Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
2012-10-21 17:35:24 +10:30
Kevin Shanahan
53077c2c54
efrags: Merge remaining differences between gl/sw efrags
...
Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
2012-10-21 17:27:34 +10:30
Kevin Shanahan
730c3f112d
efrags: Don't add the world in glquake either
...
Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
2012-10-21 17:26:44 +10:30
Kevin Shanahan
deb4578bc5
efrags: remove unneeded include
...
Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
2012-10-21 17:24:10 +10:30
Kevin Shanahan
293084be9b
nq: handle visedicts similarly to qw
...
Make handling of cl_visedicts as similar as possible to qw. I am not yet
100% conviced that this has not introduced subtle bugs due to now taking a
copy of the entities in this list, but merging the behaviour is probably
the right way to go (and fix the bugs later).
Quickly played through a couple of random maps and nothing jumped out as
being obviously incorrect.
Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
2012-10-21 17:07:43 +10:30
Kevin Shanahan
d8781b30d2
qw: Hide the buffered edicts list in cl_ent.c
...
The structures used to buffer the edict info which enables the QW
prediction logic can be hidden away inside cl_ent.c.
Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
2012-10-21 15:39:49 +10:30
Kevin Shanahan
bea77b4b38
nq: Store item info within stats in client state
...
Make NQ store the item status within the stats array in the client state,
consistent with QW.
Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
2012-10-21 15:22:32 +10:30
Kevin Shanahan
7007067318
particles: move r_part.c to common directory
...
Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
2012-10-21 14:36:52 +10:30
Kevin Shanahan
ac28564bc2
particles: Merge difference between QW/NQ r_part.c
...
Again, quite a few silly "hacks" in there but can start to shake out some
of the differences as we go along.
Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
2012-10-21 14:35:00 +10:30
Kevin Shanahan
d44c3ca359
particles: Disable and conditionally re-enable alpha test
...
Seems like something that should be known before going into the function,
but QW does this currently and should be harmless for NQ. Consitency more
valuable for now.
Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
2012-10-21 14:29:25 +10:30
Kevin Shanahan
8bf8cad032
particles: Refactor R_RocketTrail to use switch statement
...
Make the QW version more similar to the NQ version in structure. Once
re-ordered, the small differences are clear.
Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
2012-10-20 18:15:29 +10:30
Kevin Shanahan
fb0c346935
particles: No difference between pt_grav and pt_slowgrav
...
Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
2012-10-20 18:01:01 +10:30
Kevin Shanahan
24af3dfe7b
qw: fix pointfile loading
...
Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
2012-10-20 17:41:26 +10:30
Kevin Shanahan
23d81d22d7
Move r_shared.h to common include dir
...
Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
2012-10-20 17:20:56 +10:30
Kevin Shanahan
7764670a2c
Merge trivial differences between r_shared.h files
...
Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
2012-10-20 17:17:55 +10:30
Kevin Shanahan
e3a0d0cac9
vid: Bump MAXWIDTH and MAXHEIGHT
...
Actually, MAXWIDTH is never used at all...
Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
2012-10-20 17:05:29 +10:30
Kevin Shanahan
ba26d5cf4c
vid: respect MAXHEIGHT in vid mode selection
...
Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
2012-10-20 17:05:11 +10:30
Kevin Shanahan
06a91def9c
vid: Make fullscreen mode switching work too
...
Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
2012-10-20 16:55:51 +10:30
Kevin Shanahan
9037052b86
vid: Implement (windowed) video mode changes via menu
...
Video mode changes via the menu now work (at least for windowed modes).
Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
2012-10-20 16:25:42 +10:30
Kevin Shanahan
fdd7c65242
trivial: whitespace
...
Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
2012-10-20 10:12:03 +10:30
Kevin Shanahan
44bbaeba2c
win: Refactor windowed mode description init
...
Make the code a bit easier to read by using a helper to init the modedescs
for windowed video modes (as done for SDL already).
Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
2012-10-20 10:07:55 +10:30
Kevin Shanahan
3f5345917a
win: Sort vidmodes by both width and height
...
Makes the sdl mode list look a bit more sane, since there are more options
there right now, but do it consistently for both drivers.
Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
2012-10-20 10:05:05 +10:30
Kevin Shanahan
bd49582749
win: Allow up to 15 fullscreen modes in video menu
...
Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
2012-10-20 10:04:19 +10:30
Kevin Shanahan
1aed0ba37e
vid: set up windowed mode list for sdl
...
Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
2012-10-20 10:00:19 +10:30
Kevin Shanahan
489ada1caa
win: Unify Sys_Doubletime across NQ/QW/QWSV
...
NQ always used the high-precision timer API, and since I added a fallback
mode it should be fine to try for high precision first on all platforms
and fall back if necessary.
Also fixes some incorrect math in the timer wraparound case which
previously existed in QW client (wrong operator precedence).
Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
2012-10-19 21:59:27 +10:30
Kevin Shanahan
89aa411b2a
win: Give timer variables a common prefix
...
Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
2012-10-19 21:28:11 +10:30
Kevin Shanahan
e2f9dbd1e8
win: Move timer initialisation to init function
...
Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
2012-10-19 21:23:16 +10:30
Kevin Shanahan
7ecb395829
win: Add a fallback timer to NQ in case hardware timers not available
...
Based on the implementation currently in QW.
Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
2012-10-19 21:10:09 +10:30