[SCM] DarkPlaces, a Quake engine branch, master, updated. debian/0_20110628+svn11231-2-2-g2d07598
Simon McVittie
smcv at debian.org
Tue Jul 19 10:42:55 UTC 2011
The following commit has been merged in the master branch:
commit bc64d94579db2354f5d0a318b730f089db0e0966
Author: Simon McVittie <smcv at debian.org>
Date: Tue Jul 19 11:26:50 2011 +0100
Remove a duplicate patch which is not actually applied
diff --git a/debian/changelog b/debian/changelog
index 6951e28..5965790 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+darkplaces (0~20110628+svn11231-3) UNRELEASED; urgency=low
+
+ * Remove a duplicate patch which is not actually applied
+
+ -- Simon McVittie <smcv at debian.org> Tue, 19 Jul 2011 11:26:36 +0100
+
darkplaces (0~20110628+svn11231-2) unstable; urgency=low
* Don't compile SSE code, or the software rasterizer (which requires SSE2),
diff --git a/debian/patches/0015-Fix-various-typos-dont-don-t-doesnt-doesn-t-arguemen.patch b/debian/patches/0015-Fix-various-typos-dont-don-t-doesnt-doesn-t-arguemen.patch
deleted file mode 100644
index 83ef21a..0000000
--- a/debian/patches/0015-Fix-various-typos-dont-don-t-doesnt-doesn-t-arguemen.patch
+++ /dev/null
@@ -1,371 +0,0 @@
-From 84c46b725131ed21f70c1a998d6102d36e97e774 Mon Sep 17 00:00:00 2001
-From: Simon McVittie <smcv at debian.org>
-Date: Thu, 7 Jul 2011 15:53:02 +0100
-Subject: [PATCH 15/15] Fix various typos: dont -> don't, doesnt -> doesn't,
- arguements -> arguments
-
-Picked up by Debian's Lintian package-checking tool.
-
-Origin: vendor, Debian
----
- cl_gecko.c | 2 +-
- cl_gecko.h | 2 +-
- clvm_cmds.c | 2 +-
- cmd.c | 2 +-
- dpdefs/csprogsdefs.qc | 4 ++--
- gl_draw.c | 2 +-
- gl_rmain.c | 2 +-
- gl_textures.c | 2 +-
- menu.c | 2 +-
- netconn.c | 4 ++--
- progsvm.h | 2 +-
- prvm_cmds.c | 8 ++++----
- prvm_edict.c | 8 ++++----
- r_sprites.c | 2 +-
- sbar.c | 2 +-
- svvm_cmds.c | 2 +-
- sys.h | 2 +-
- todo | 4 ++--
- vid_sdl.c | 2 +-
- vid_wgl.c | 2 +-
- world.c | 2 +-
- 21 files changed, 30 insertions(+), 30 deletions(-)
-
-diff --git a/cl_gecko.c b/cl_gecko.c
-index ef8ede4..7de4a24 100644
---- a/cl_gecko.c
-+++ b/cl_gecko.c
-@@ -598,7 +598,7 @@ clgecko_t * CL_Gecko_CreateBrowser( const char *name, int ownerProg ) {
-
- if (!CL_Gecko_Embedding_Init ()) return NULL;
-
-- // TODO: verify that we dont use a name twice
-+ // TODO: verify that we don't use a name twice
- instance = cl_gecko_findunusedinstance();
- // TODO: assert != NULL
-
-diff --git a/cl_gecko.h b/cl_gecko.h
-index c95b410..f943280 100644
---- a/cl_gecko.h
-+++ b/cl_gecko.h
-@@ -11,7 +11,7 @@ typedef enum clgecko_buttoneventtype_e {
- CLG_BET_DOWN,
- CLG_BET_UP,
- CLG_BET_DOUBLECLICK,
-- // use for up + down (but dont use both)
-+ // use for up + down (but don't use both)
- CLG_BET_PRESS
- } clgecko_buttoneventtype_t;
-
-diff --git a/clvm_cmds.c b/clvm_cmds.c
-index cedd208..3c2b338 100644
---- a/clvm_cmds.c
-+++ b/clvm_cmds.c
-@@ -446,7 +446,7 @@ static void VM_CL_findradius (void)
- else
- chainfield = prog->fieldoffsets.chain;
- if(chainfield < 0)
-- PRVM_ERROR("VM_findchain: %s doesnt have the specified chain field !", PRVM_NAME);
-+ PRVM_ERROR("VM_findchain: %s doesn't have the specified chain field !", PRVM_NAME);
-
- chain = (prvm_edict_t *)prog->edicts;
-
-diff --git a/cmd.c b/cmd.c
-index bbaca64..cb0355d 100644
---- a/cmd.c
-+++ b/cmd.c
-@@ -1346,7 +1346,7 @@ static void Cmd_TokenizeString (const char *text)
- l = (int)strlen(com_token) + 1;
- if (cmd_tokenizebufferpos + l > CMD_TOKENIZELENGTH)
- {
-- Con_Printf("Cmd_TokenizeString: ran out of %i character buffer space for command arguements\n", CMD_TOKENIZELENGTH);
-+ Con_Printf("Cmd_TokenizeString: ran out of %i character buffer space for command arguments\n", CMD_TOKENIZELENGTH);
- break;
- }
- memcpy (cmd_tokenizebuffer + cmd_tokenizebufferpos, com_token, l);
-diff --git a/dpdefs/csprogsdefs.qc b/dpdefs/csprogsdefs.qc
-index 2100605..977fecf 100644
---- a/dpdefs/csprogsdefs.qc
-+++ b/dpdefs/csprogsdefs.qc
-@@ -777,8 +777,8 @@ float(float entitynum, float fldnum) getentity = #504;
- vector(float entitynum, float fldnum) getentityvec = #504;
- // description: allows to query parms from render entities, especially useful with attaching CSQC ents to
- // server entities networked and interpolated by engine (monsters, players), number of entity is it's SVQC number
--// you can send it via tempentity/CSQC entity message. Note that this builtin doesnt know about entity removing/reallocating
--// so it's meaning to work for short period of time, dont use it on missiles/grenades whatever will be removed next five seconds
-+// you can send it via tempentity/CSQC entity message. Note that this builtin doesn't know about entity removing/reallocating
-+// so it's meaning to work for short period of time, don't use it on missiles/grenades whatever will be removed next five seconds
-
- //DP_GFX_FONTS
- //idea: Blub\0, divVerent
-diff --git a/gl_draw.c b/gl_draw.c
-index ef1fee2..0c4bcc5 100644
---- a/gl_draw.c
-+++ b/gl_draw.c
-@@ -851,7 +851,7 @@ static void LoadFont_f(void)
- "loadfont console gfx/conchars,gfx/fallback 8 12 16 24 32\n"
- "In many cases, 8 12 16 24 32 should be a good choice.\n"
- "custom switches:\n"
-- " scale x : scale all characters by this amount when rendering (doesnt change line height)\n"
-+ " scale x : scale all characters by this amount when rendering (doesn't change line height)\n"
- " voffset x : offset all chars vertical when rendering, this is multiplied to character height\n"
- );
- return;
-diff --git a/gl_rmain.c b/gl_rmain.c
-index 04ad617..ca7b583 100644
---- a/gl_rmain.c
-+++ b/gl_rmain.c
-@@ -3189,7 +3189,7 @@ skinframe_t *R_SkinFrame_Find(const char *name, int textureflags, int comparewid
- {
- rtexture_t *dyntexture;
- // check whether its a dynamic texture
-- // this only needs to be done because Purge doesnt delete skinframes - only sets the texture pointers to NULL and we need to restore it before returing.. [11/29/2007 Black]
-+ // this only needs to be done because Purge doesn't delete skinframes - only sets the texture pointers to NULL and we need to restore it before returing.. [11/29/2007 Black]
- dyntexture = CL_GetDynTexture( basename );
- item->base = dyntexture; // either NULL or dyntexture handle
- }
-diff --git a/gl_textures.c b/gl_textures.c
-index edefc5a..45855d6 100644
---- a/gl_textures.c
-+++ b/gl_textures.c
-@@ -264,7 +264,7 @@ void R_MarkDirtyTexture(rtexture_t *rt) {
- return;
- }
-
-- // dont do anything if the texture is already dirty (and make sure this *is* a dynamic texture after all!)
-+ // don't do anything if the texture is already dirty (and make sure this *is* a dynamic texture after all!)
- if (glt->flags & GLTEXF_DYNAMIC)
- {
- // mark it as dirty, so R_RealGetTexture gets called
-diff --git a/menu.c b/menu.c
-index c09abda..9ef13e8 100644
---- a/menu.c
-+++ b/menu.c
-@@ -3210,7 +3210,7 @@ static int M_ChooseQuitMessage(int request)
- if (request-- == 0) return M_QuitMessage("All your quit are","belong to long duck","dong",NULL,NULL,NULL,NULL,NULL);
- if (request-- == 0) return M_QuitMessage("Press Y to quit","","But are you too legit?",NULL,NULL,NULL,NULL,NULL);
- if (request-- == 0) return M_QuitMessage("This game was made by","e at chip-web.com","It is by far the best","game ever made.",NULL,NULL,NULL,NULL);
-- if (request-- == 0) return M_QuitMessage("Even I really dont","know of a game better","Press Y to quit","like rougue chedder",NULL,NULL,NULL,NULL);
-+ if (request-- == 0) return M_QuitMessage("Even I really don't","know of a game better","Press Y to quit","like rougue chedder",NULL,NULL,NULL,NULL);
- if (request-- == 0) return M_QuitMessage("After you stop playing","tell the guys who made","counterstrike to just","kill themselves now",NULL,NULL,NULL,NULL);
- if (request-- == 0) return M_QuitMessage("Press Y to exit to DOS","","SSH login as user Y","to exit to Linux",NULL,NULL,NULL,NULL);
- if (request-- == 0) return M_QuitMessage("Press Y like you","were waanderers","from Ys'",NULL,NULL,NULL,NULL,NULL);
-diff --git a/netconn.c b/netconn.c
-index 65b6483..b3c1b6b 100755
---- a/netconn.c
-+++ b/netconn.c
-@@ -1444,7 +1444,7 @@ static int NetConn_ClientParsePacket_ServerList_ProcessReply(const char *address
-
- if (n == serverlist_cachecount)
- {
-- // LAN search doesnt require an answer from the master server so we wont
-+ // LAN search doesn't require an answer from the master server so we wont
- // know the ping nor will it be initialized already...
-
- // find a slot
-@@ -1476,7 +1476,7 @@ static int NetConn_ClientParsePacket_ServerList_ProcessReply(const char *address
- entry->query = SQS_QUERIED;
- } else {
- // convert to unsigned to catch the -1
-- // I still dont like this but its better than the old 10000 magic ping number - as in easier to type and read :( [11/8/2007 Black]
-+ // I still don't like this but its better than the old 10000 magic ping number - as in easier to type and read :( [11/8/2007 Black]
- entry->info.ping = min((unsigned) entry->info.ping, (unsigned) pingtime);
- serverreplycount++;
- }
-diff --git a/progsvm.h b/progsvm.h
-index 60c3f21..b252a61 100644
---- a/progsvm.h
-+++ b/progsvm.h
-@@ -68,7 +68,7 @@ typedef struct prvm_required_field_s
- } prvm_required_field_t;
-
-
--// AK: I dont call it engine private cause it doesnt really belongs to the engine
-+// AK: I don't call it engine private because it doesn't really belong to the engine,
- // it belongs to prvm.
- typedef struct prvm_edict_private_s
- {
-diff --git a/prvm_cmds.c b/prvm_cmds.c
-index df5ea5e..a6dd0af 100644
---- a/prvm_cmds.c
-+++ b/prvm_cmds.c
-@@ -1080,7 +1080,7 @@ void VM_findchain (void)
- else
- chainfield = prog->fieldoffsets.chain;
- if (chainfield < 0)
-- PRVM_ERROR("VM_findchain: %s doesnt have the specified chain field !", PRVM_NAME);
-+ PRVM_ERROR("VM_findchain: %s doesn't have the specified chain field !", PRVM_NAME);
-
- chain = prog->edicts;
-
-@@ -1135,7 +1135,7 @@ void VM_findchainfloat (void)
- else
- chainfield = prog->fieldoffsets.chain;
- if (chainfield < 0)
-- PRVM_ERROR("VM_findchain: %s doesnt have the specified chain field !", PRVM_NAME);
-+ PRVM_ERROR("VM_findchain: %s doesn't have the specified chain field !", PRVM_NAME);
-
- chain = (prvm_edict_t *)prog->edicts;
-
-@@ -1221,7 +1221,7 @@ void VM_findchainflags (void)
- else
- chainfield = prog->fieldoffsets.chain;
- if (chainfield < 0)
-- PRVM_ERROR("VM_findchain: %s doesnt have the specified chain field !", PRVM_NAME);
-+ PRVM_ERROR("VM_findchain: %s doesn't have the specified chain field !", PRVM_NAME);
-
- chain = (prvm_edict_t *)prog->edicts;
-
-@@ -4963,7 +4963,7 @@ void VM_buf_implode (void)
- /*
- ========================
- VM_bufstr_get
--get a string from buffer, returns tempstring, dont str_unzone it!
-+get a string from buffer, returns tempstring, don't str_unzone it!
- string bufstr_get(float bufhandle, float string_index) = #465;
- ========================
- */
-diff --git a/prvm_edict.c b/prvm_edict.c
-index ffe917a..2ee2bfd 100644
---- a/prvm_edict.c
-+++ b/prvm_edict.c
-@@ -164,7 +164,7 @@ qboolean PRVM_ProgLoaded(int prognr)
- PRVM_SetProgFromString
- =================
- */
--// perhaps add a return value when the str doesnt exist
-+// perhaps add a return value when the str doesn't exist
- qboolean PRVM_SetProgFromString(const char *str)
- {
- int i = 0;
-@@ -271,8 +271,8 @@ prvm_edict_t *PRVM_ED_Alloc (void)
- int i;
- prvm_edict_t *e;
-
-- // the client qc dont need maxclients
-- // thus it doesnt need to use svs.maxclients
-+ // the client qc doesn't need maxclients
-+ // thus it doesn't need to use svs.maxclients
- // AK: changed i=svs.maxclients+1
- // AK: changed so the edict 0 wont spawn -> used as reserved/world entity
- // although the menu/client has no world
-@@ -312,7 +312,7 @@ FIXME: walk all entities and NULL out references to this entity
- */
- void PRVM_ED_Free (prvm_edict_t *ed)
- {
-- // dont delete the null entity (world) or reserved edicts
-+ // don't delete the null entity (world) or reserved edicts
- if(PRVM_NUM_FOR_EDICT(ed) <= prog->reserved_edicts )
- return;
-
-diff --git a/r_sprites.c b/r_sprites.c
-index 486b119..37ee28e 100644
---- a/r_sprites.c
-+++ b/r_sprites.c
-@@ -394,7 +394,7 @@ void R_Model_Sprite_Draw_TransparentCallback(const entity_render_t *ent, const r
-
- // lit sprite by lightgrid if it is not fullbright, lit only ambient
- if (!(texture->currentmaterialflags & MATERIALFLAG_FULLBRIGHT))
-- VectorAdd(ent->modellight_ambient, ent->modellight_diffuse, rsurface.modellight_ambient); // sprites dont use lightdirection
-+ VectorAdd(ent->modellight_ambient, ent->modellight_diffuse, rsurface.modellight_ambient); // sprites don't use lightdirection
-
- // SPR_LABEL should not use depth test AT ALL
- if(model->sprite.sprnum_type == SPR_LABEL || model->sprite.sprnum_type == SPR_LABEL_SCALE)
-diff --git a/sbar.c b/sbar.c
-index 80c6330..a649ca7 100644
---- a/sbar.c
-+++ b/sbar.c
-@@ -1530,7 +1530,7 @@ void Sbar_Draw (void)
- else
- Sbar_DrawXNum((154-3*24),12,cl.stats[STAT_HEALTH],3,24,0.6,0.7,0.8,1,0);
-
-- // AK dont draw ammo for the laser
-+ // AK don't draw ammo for the laser
- if(cl.stats[STAT_ACTIVEWEAPON] != 12)
- {
- if (cl.stats[STAT_ITEMS] & NEX_IT_SHELLS)
-diff --git a/svvm_cmds.c b/svvm_cmds.c
-index 5c7de14..3736279 100644
---- a/svvm_cmds.c
-+++ b/svvm_cmds.c
-@@ -950,7 +950,7 @@ static void VM_SV_findradius (void)
- else
- chainfield = prog->fieldoffsets.chain;
- if (chainfield < 0)
-- PRVM_ERROR("VM_findchain: %s doesnt have the specified chain field !", PRVM_NAME);
-+ PRVM_ERROR("VM_findchain: %s doesn't have the specified chain field !", PRVM_NAME);
-
- chain = (prvm_edict_t *)prog->edicts;
-
-diff --git a/sys.h b/sys.h
-index 37fcc80..ccff58a 100644
---- a/sys.h
-+++ b/sys.h
-@@ -73,7 +73,7 @@ void Sys_Error (const char *error, ...) DP_FUNC_PRINTF(1);
- /// (may) output text to terminal which launched program
- void Sys_PrintToTerminal(const char *text);
-
--/// INFO: This is only called by Host_Shutdown so we dont need testing for recursion
-+/// INFO: This is only called by Host_Shutdown so we don't need testing for recursion
- void Sys_Shutdown (void);
- void Sys_Quit (int returnvalue);
-
-diff --git a/todo b/todo
-index adfa4eb..08257b4 100644
---- a/todo
-+++ b/todo
-@@ -373,7 +373,7 @@
- 2 feature darkplaces client: decal clipping (romi)
- 2 feature darkplaces client: http download and parse http://www.gameaholic.com/servers/qspy-quake for nq servers (Spike)
- 2 feature darkplaces client: interpolate scale and alpha changes (Cheapy)
--2 feature darkplaces client: make CL_Video use TEXF_FRAGMENT again by adding general, transparent support for it in all drawqueue functions (so you dont need to call FragmentLocation) (Black)
-+2 feature darkplaces client: make CL_Video use TEXF_FRAGMENT again by adding general, transparent support for it in all drawqueue functions (so you don't need to call FragmentLocation) (Black)
- 2 feature darkplaces image: add scaling capabilities to Image_CopyMux
- 2 feature darkplaces loader: add support for fuhquake naming of map textures (textures/start/quake.tga style)
- 2 feature darkplaces loader: implement vertex cache optimization of models during loading, see this paper: http://home.comcast.net/~tom_forsyth/papers/fast_vert_cache_opt.html (Dresk)
-@@ -1437,4 +1437,4 @@ f feature dpmod: include .lit and .dlit files for all id1 maps - this idea was r
- f feature dpmod: include .vis files for all id1 maps - this idea rejected due to lack of .vis support and download size
- f hqbsp: CreateBrushFaces should use RadiusFromBounds for its rotation box code, but hmap is obsolete (Vic)
- f optimization darkplaces renderer: change water distortion textures from multiple 2D textures to one 3D texture for smoother animation (Tomaz)
--f optimization darkplaces visibility: R_Q3BSP_RecursiveWorldNode should take clipflags parameter and do not cull a node against a plane if the parent node is totally on one side of the plane (Vic)
-\ No newline at end of file
-+f optimization darkplaces visibility: R_Q3BSP_RecursiveWorldNode should take clipflags parameter and do not cull a node against a plane if the parent node is totally on one side of the plane (Vic)
-diff --git a/vid_sdl.c b/vid_sdl.c
-index d356150..4bdeb98 100644
---- a/vid_sdl.c
-+++ b/vid_sdl.c
-@@ -1695,7 +1695,7 @@ void VID_EnableJoystick(qboolean enable)
- }
-
- #if SETVIDEOMODE
--// set the icon (we dont use SDL here since it would be too much a PITA)
-+// set the icon (we don't use SDL here since it would be too much a PITA)
- #ifdef WIN32
- #include "resource.h"
- #include <SDL_syswm.h>
-diff --git a/vid_wgl.c b/vid_wgl.c
-index d30c6a7..79ceeaa 100644
---- a/vid_wgl.c
-+++ b/vid_wgl.c
-@@ -496,7 +496,7 @@ void AppActivate(BOOL fActive, BOOL minimize)
- }
- }
-
--//TODO: move it around in vid_wgl.c since I dont think this is the right position
-+//TODO: move it around in vid_wgl.c since I don't think this is the right position
- void Sys_SendKeyEvents (void)
- {
- MSG msg;
-diff --git a/world.c b/world.c
-index 1a8c362..ea08ff2 100644
---- a/world.c
-+++ b/world.c
-@@ -348,7 +348,7 @@ cvar_t physics_ode_world_damping_angular = {0, "physics_ode_world_damping_angula
- cvar_t physics_ode_world_damping_angular_threshold = {0, "physics_ode_world_damping_angular_threshold", "0.01", "world angular damping threshold (see ODE User Guide); use defaults when set to -1"};
- cvar_t physics_ode_iterationsperframe = {0, "physics_ode_iterationsperframe", "1", "divisor for time step, runs multiple physics steps per frame"};
- cvar_t physics_ode_constantstep = {0, "physics_ode_constantstep", "1", "use constant step (sys_ticrate value) instead of variable step which tends to increase stability"};
--cvar_t physics_ode_autodisable = {0, "physics_ode_autodisable", "1", "automatic disabling of objects which dont move for long period of time, makes object stacking a lot faster"};
-+cvar_t physics_ode_autodisable = {0, "physics_ode_autodisable", "1", "automatic disabling of objects which don't move for long period of time, makes object stacking a lot faster"};
- cvar_t physics_ode_autodisable_steps = {0, "physics_ode_autodisable_steps", "10", "how many steps object should be dormant to be autodisabled"};
- cvar_t physics_ode_autodisable_time = {0, "physics_ode_autodisable_time", "0", "how many seconds object should be dormant to be autodisabled"};
- cvar_t physics_ode_autodisable_threshold_linear = {0, "physics_ode_autodisable_threshold_linear", "0.2", "body will be disabled if it's linear move below this value"};
--
DarkPlaces, a Quake engine
More information about the Pkg-games-commits
mailing list