Permalink
Browse files

Whitespace fixes.

  • Loading branch information...
1 parent 2c851b0 commit ab034114b44f53ee74ceab5ace76940027421ef3 @chmallon chmallon committed with Yamagi Apr 29, 2012
Showing with 3,167 additions and 3,325 deletions.
  1. +4 −4 CHANGELOG
  2. +1 −2 LICENSE
  3. +25 −25 Makefile
  4. +103 −103 README
  5. +1 −2 src/client/cl_cin.c
  6. +1 −2 src/client/cl_console.c
  7. +5 −6 src/client/cl_download.c
  8. +1 −2 src/client/cl_effects.c
  9. +0 −1 src/client/cl_entities.c
  10. +1 −2 src/client/cl_input.c
  11. +1 −2 src/client/cl_inventory.c
  12. +0 −1 src/client/cl_keyboard.c
  13. +2 −3 src/client/cl_lights.c
  14. +2 −3 src/client/cl_main.c
  15. +2 −3 src/client/cl_network.c
  16. +5 −6 src/client/cl_parse.c
  17. +3 −4 src/client/cl_particles.c
  18. +0 −1 src/client/cl_prediction.c
  19. +0 −1 src/client/cl_screen.c
  20. +0 −1 src/client/cl_tempentities.c
  21. +0 −1 src/client/cl_view.c
  22. +3 −4 src/client/header/client.h
  23. +0 −1 src/client/header/console.h
  24. +0 −1 src/client/header/input.h
  25. +0 −1 src/client/header/keyboard.h
  26. +0 −1 src/client/header/ref.h
  27. +0 −1 src/client/header/screen.h
  28. +0 −1 src/client/header/vid.h
  29. +0 −1 src/client/menu/header/qmenu.h
  30. +10 −11 src/client/menu/menu.c
  31. +0 −1 src/client/menu/qmenu.c
  32. +1 −2 src/client/menu/videomenu.c
  33. +1 −2 src/client/sound/header/cdaudio.h
  34. +0 −1 src/client/sound/header/local.h
  35. +0 −1 src/client/sound/header/sound.h
  36. +2 −3 src/client/sound/header/vorbis.h
  37. +2 −2 src/client/sound/snd_al.c
  38. +12 −13 src/client/sound/snd_dma.c
  39. +0 −1 src/client/sound/snd_mem.c
  40. +2 −3 src/client/sound/snd_mix.c
  41. +2 −3 src/client/sound/snd_vorbis.c
  42. +0 −1 src/client/sound/snd_wav.c
  43. +0 −1 src/common/command/cmd_execution.c
  44. +2 −3 src/common/command/cmd_parser.c
  45. +0 −1 src/common/command/cmd_script.c
  46. +1 −2 src/common/common/com_arg.c
  47. +2 −3 src/common/common/com_clientserver.c
  48. +1 −1 src/common/crc.c
  49. +14 −14 src/common/filesystem.c
  50. +3 −4 src/common/header/cmd.h
  51. +1 −2 src/common/header/cmodel.h
  52. +8 −8 src/common/header/common.h
  53. +0 −1 src/common/header/crc.h
  54. +22 −22 src/common/header/shared.h
  55. +0 −1 src/common/header/zone.h
  56. +1 −2 src/common/md4.c
  57. +1 −2 src/common/message/msg_io.c
  58. +0 −1 src/common/message/msg_read.c
  59. +0 −1 src/common/misc.c
  60. +1 −2 src/common/model/cm_areaportals.c
  61. +0 −1 src/common/model/cm_box.c
  62. +3 −4 src/common/model/cm_boxtracing.c
  63. +2 −3 src/common/model/cm_bsp.c
  64. +2 −3 src/common/model/cm_vis.c
  65. +2 −3 src/common/shared/flash.c
  66. +13 −14 src/common/shared/shared.c
  67. +1 −2 src/common/szone.c
  68. +1 −2 src/common/zone.c
  69. +48 −49 src/game/g_ai.c
  70. +0 −1 src/game/g_chase.c
  71. +43 −44 src/game/g_cmds.c
  72. +13 −14 src/game/g_combat.c
  73. +210 −211 src/game/g_func.c
  74. +73 −74 src/game/g_items.c
  75. +5 −6 src/game/g_main.c
  76. +142 −143 src/game/g_misc.c
  77. +68 −69 src/game/g_monster.c
  78. +61 −62 src/game/g_phys.c
  79. +16 −17 src/game/g_spawn.c
  80. +3 −4 src/game/g_svcmds.c
  81. +90 −91 src/game/g_target.c
  82. +76 −77 src/game/g_trigger.c
  83. +23 −24 src/game/g_turret.c
  84. +28 −29 src/game/g_utils.c
  85. +45 −46 src/game/g_weapon.c
  86. +19 −20 src/game/header/game.h
  87. +18 −19 src/game/header/local.h
  88. +57 −58 src/game/monster/berserker/berserker.c
  89. +61 −62 src/game/monster/boss2/boss2.c
  90. +6 −7 src/game/monster/boss3/boss3.c
  91. +80 −81 src/game/monster/boss3/boss31.c
  92. +79 −80 src/game/monster/boss3/boss32.c
  93. +71 −72 src/game/monster/brain/brain.c
  94. +71 −72 src/game/monster/chick/chick.c
  95. +42 −43 src/game/monster/flipper/flipper.c
  96. +1 −1 src/game/monster/flipper/flipper.h
  97. +55 −56 src/game/monster/float/float.c
  98. +92 −93 src/game/monster/flyer/flyer.c
  99. +57 −58 src/game/monster/gladiator/gladiator.c
  100. +83 −84 src/game/monster/gunner/gunner.c
  101. +59 −60 src/game/monster/hover/hover.c
  102. +57 −58 src/game/monster/infantry/infantry.c
  103. +50 −51 src/game/monster/insane/insane.c
  104. +50 −51 src/game/monster/medic/medic.c
  105. +25 −26 src/game/monster/misc/move.c
  106. +0 −1 src/game/monster/misc/player.h
  107. +61 −62 src/game/monster/mutant/mutant.c
  108. +56 −57 src/game/monster/parasite/parasite.c
  109. +99 −100 src/game/monster/soldier/soldier.c
  110. +1 −1 src/game/monster/soldier/soldier.h
  111. +44 −45 src/game/monster/supertank/supertank.c
  112. +66 −67 src/game/monster/tank/tank.c
  113. +113 −114 src/game/player/client.c
  114. +24 −25 src/game/player/hud.c
  115. +7 −8 src/game/player/trail.c
  116. +34 −35 src/game/player/view.c
  117. +68 −69 src/game/player/weapon.c
  118. +31 −32 src/game/savegame/savegame.c
  119. +1 −1 src/game/savegame/tables/clientfields.h
  120. +2 −2 src/game/savegame/tables/fields.h
  121. +1 −1 src/game/savegame/tables/gamefunc_decs.h
  122. +1 −1 src/game/savegame/tables/gamefunc_list.h
  123. +1 −1 src/game/savegame/tables/gamemmove_decs.h
  124. +1 −1 src/game/savegame/tables/gamemmove_list.h
  125. +2 −2 src/game/savegame/tables/levelfields.h
  126. +0 −1 src/refresh/constants/anorms.h
  127. +1 −1 src/refresh/constants/anormtab.h
  128. +0 −1 src/refresh/files/jpeg.c
  129. +0 −1 src/refresh/files/md2.c
  130. +0 −1 src/refresh/files/pcx.c
  131. +2 −3 src/refresh/files/sp2.c
  132. +0 −1 src/refresh/files/tga.c
  133. +0 −1 src/refresh/files/wal.c
  134. +1 −2 src/refresh/header/model.h
  135. +0 −1 src/refresh/header/qgl.h
  136. +2 −3 src/refresh/r_draw.c
  137. +2 −3 src/refresh/r_image.c
  138. +6 −7 src/refresh/r_light.c
  139. +0 −1 src/refresh/r_lightmap.c
  140. +1 −2 src/refresh/r_main.c
  141. +2 −3 src/refresh/r_mesh.c
  142. +0 −1 src/refresh/r_misc.c
  143. +5 −6 src/refresh/r_model.c
  144. +1 −2 src/refresh/r_scrap.c
  145. +1 −2 src/refresh/r_surf.c
  146. +0 −1 src/refresh/r_warp.c
  147. +0 −1 src/sdl/cd.c
  148. +39 −40 src/sdl/input.c
  149. +28 −29 src/sdl/refresh.c
  150. +4 −5 src/sdl/sound.c
  151. +7 −8 src/server/header/server.h
  152. +4 −5 src/server/sv_cmd.c
  153. +4 −5 src/server/sv_conless.c
  154. +11 −12 src/server/sv_entities.c
  155. +1 −2 src/server/sv_game.c
  156. +4 −5 src/server/sv_init.c
  157. +6 −7 src/server/sv_main.c
  158. +5 −6 src/server/sv_save.c
  159. +5 −6 src/server/sv_send.c
  160. +2 −3 src/server/sv_user.c
  161. +9 −10 src/server/sv_world.c
  162. +3 −4 src/unix/glob.c
  163. +1 −2 src/unix/header/glob.h
  164. +0 −1 src/unix/header/glwindow.h
  165. +1 −2 src/unix/header/qal.h
  166. +0 −1 src/unix/header/unix.h
  167. +2 −3 src/unix/hunk.c
  168. +2 −3 src/unix/main.c
  169. +16 −17 src/unix/network.c
  170. +83 −84 src/unix/qal.c
  171. +3 −4 src/unix/qgl.c
  172. +2 −3 src/unix/signalhandler.c
  173. +2 −3 src/unix/system.c
  174. +1 −2 src/unix/vid.c
  175. +14 −14 stuff/cdripper.sh
  176. +18 −19 stuff/quake2-start.sh
  177. +3 −4 stuff/yq2.cfg
View
@@ -77,7 +77,7 @@ Quake II 2.11 to 3.00RC1
- Reimplemented the gamma control using native X11 calls.
This should fix the gamma for all setups.
- Support for overbright bits.
-- Changed the window title to "Yamagi Quake II".
+- Changed the window title to "Yamagi Quake II".
Quake II 2.10 to 2.11
- Fix a bug in the client. This fixes the strange crashes
@@ -103,15 +103,15 @@ Quake II 2.10RC2 to 2.10RC3:
Quake II 2.10RC to 2.10RC2:
- Fix a problem with machine gun soldiers deadlocking
- Change CFLAGS to a saner default
-- Quake II now creates ~/.quake2 if it doesn't exist (reported
+- Quake II now creates ~/.quake2 if it doesn't exist (reported
by N. Tsakiris)
- Slightly better game performance (~10 FPS)
Quake II 2.00 to 2.10RC:
- Automagical releases the mouse when the console is opened
- Increased the maximal amount of file descriptores from 64
to 256. This should fix some very rare crashes with 'The
- Reconing' and possible similar problems with mods.
+ Reconing' and possible similar problems with mods.
(reported by E. Müller)
- Support for custom resolutions (by caedes and Yamagi)
@@ -123,7 +123,7 @@ Quake II 1.05 to 2.00:
- Some bugfixes
Quake II 1.04 to 1.05:
-- Fix slowdown with CD music under Linux (by caedes)
+- Fix slowdown with CD music under Linux (by caedes)
Quake II 1.03 to 1.04:
- Added icon (by caedes)
View
@@ -430,7 +430,6 @@ freely, subject to the above disclaimer and the following restrictions:
4. Info-ZIP retains the right to use the names "Info-ZIP," "Zip," "UnZip,"
"UnZipSFX," "WiZ," "Pocket UnZip," "Pocket Zip," and "MacZip" for its
- own source and binary releases.
+ own source and binary releases.
===============================================================================
-
View
@@ -14,7 +14,7 @@
# Platforms: #
# - Linux #
# - FreeBSD #
-# ------------------------------------------------------ #
+# ------------------------------------------------------ #
# User configurable options
# -------------------------
@@ -80,10 +80,10 @@ CC := gcc
# ----------
-# Base CFLAGS.
+# Base CFLAGS.
#
# -O2 are enough optimizations.
-#
+#
# -fno-strict-aliasing since the source doesn't comply
# with strict aliasing rules and it's next to impossible
# to get it there...
@@ -116,9 +116,9 @@ SDLCFLAGS := $(shell sdl-config --cflags)
# ----------
-# Extra CFLAGS for X11
+# Extra CFLAGS for X11
ifeq ($(WITH_X11GAMMA),yes)
-X11CFLAGS := $(shell pkg-config x11 --cflags)
+X11CFLAGS := $(shell pkg-config x11 --cflags)
X11CFLAGS += $(shell pkg-config xxf86vm --cflags)
else
X11CFLAGS :=
@@ -131,7 +131,7 @@ ifeq ($(OSTYPE),Linux)
INCLUDE := -I/usr/include
else ifeq ($(OSTYPE),FreeBSD)
INCLUDE := -I/usr/local/include
-endif
+endif
# ----------
@@ -140,7 +140,7 @@ ifeq ($(OSTYPE),Linux)
LDFLAGS := -L/usr/lib -lm -ldl
else ifeq ($(OSTYPE),FreeBSD)
LDFLAGS := -L/usr/local/lib -lm
-endif
+endif
# ----------
@@ -149,9 +149,9 @@ SDLLDFLAGS := $(shell sdl-config --libs)
# ----------
-# Extra LDFLAGS for X11
+# Extra LDFLAGS for X11
ifeq ($(WITH_X11GAMMA),yes)
-X11LDFLAGS := $(shell pkg-config x11 --libs)
+X11LDFLAGS := $(shell pkg-config x11 --libs)
X11LDFLAGS += $(shell pkg-config xxf86vm --libs)
else
X11LDFLAGS :=
@@ -166,7 +166,7 @@ ifdef VERBOSE
Q :=
else
Q := @
-endif
+endif
# ----------
@@ -179,14 +179,14 @@ all: client server refresher game
clean:
@echo "===> CLEAN"
${Q}rm -Rf build release
-
+
# ----------
-# The client
+# The client
client:
@echo '===> Building quake2'
${Q}mkdir -p release
- $(MAKE) release/quake2
+ $(MAKE) release/quake2
build/client/%.o: %.c
@echo '===> CC $<'
@@ -324,7 +324,7 @@ GAME_OBJS_ = \
src/game/player/view.o \
src/game/player/weapon.o \
src/game/savegame/savegame.o
-
+
# ----------
# Used by the client
@@ -399,7 +399,7 @@ CLIENT_OBJS_ := \
src/unix/qal.o \
src/unix/signalhandler.o \
src/unix/system.o \
- src/unix/vid.o
+ src/unix/vid.o
# ----------
@@ -445,7 +445,7 @@ SERVER_OBJS_ := \
src/unix/network.o \
src/unix/signalhandler.o \
src/unix/system.o
-
+
# ----------
# Used by the OpenGL refresher
@@ -485,23 +485,23 @@ GAME_OBJS = $(patsubst %,build/baseq2/%,$(GAME_OBJS_))
# ----------
# Generate header dependencies
-CLIENT_DEPS= $(CLIENT_OBJS:.o=.d)
-SERVER_DEPS= $(SERVER_OBJS:.o=.d)
-OPENGL_DEPS= $(OPENGL_OBJS:.o=.d)
-GAME_DEPS= $(GAME_OBJS:.o=.d)
+CLIENT_DEPS= $(CLIENT_OBJS:.o=.d)
+SERVER_DEPS= $(SERVER_OBJS:.o=.d)
+OPENGL_DEPS= $(OPENGL_OBJS:.o=.d)
+GAME_DEPS= $(GAME_OBJS:.o=.d)
# ----------
# Suck header dependencies in
--include $(CLIENT_DEPS)
--include $(SERVER_DEPS)
--include $(OPENGL_DEPS)
--include $(GAME_DEPS)
+-include $(CLIENT_DEPS)
+-include $(SERVER_DEPS)
+-include $(OPENGL_DEPS)
+-include $(GAME_DEPS)
# ----------
# release/quake2
-release/quake2 : $(CLIENT_OBJS)
+release/quake2 : $(CLIENT_OBJS)
@echo '===> LD $@'
${Q}$(CC) $(CLIENT_OBJS) $(LDFLAGS) $(SDLLDFLAGS) -o $@
Oops, something went wrong.

0 comments on commit ab03411

Please sign in to comment.