[SCM] Packaging for Red Eclipse branch, master-svn-ppa, updated. debian/1.2-2-52-g97e4152
Martin Erik Werner
martinerikwerner at gmail.com
Tue Aug 7 19:29:50 UTC 2012
The following commit has been merged in the master-svn-ppa branch:
commit 67bc79f78bb26a74f35817e1a876515ca3f812b2
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date: Sat Aug 4 03:58:47 2012 +0200
Imported Upstream version 1.2+svn3799
diff --git a/changelog.txt b/changelog.txt
index 9c16559..5d5ee44 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -14,7 +14,7 @@ Maps:
* Conflict, new map
* Fourplex, new map
* Starlibido, new map
- * Industrual, new map
+ * Industrial, new map
* mapname.wpt and mapname.txt is now included when sending a map
Modes & Mutators:
@@ -30,9 +30,10 @@ Misc:
* SDL 1.2.15
* Remove "-r" command-line option
* Added server hosting and player guidelines for the master server
- * Enet 1.3.4
+ * Enet 1.3.5
* 64bit builds for Windows
* Use APP/app* variables for name abstraction (simplifies forking/install renaming)
+ * *nix icons stored as PNG, no ImageMagick needed in system-install process
Additional Fixed Bugs:
* #103 [minor] Revenge-seeking remains after team-change
@@ -48,6 +49,7 @@ Additional Fixed Bugs:
* #154 Fix darkness omega bb-goal to be at same position as alpha
* #158 Possibility to miss first checkpoint on testchamber
* #161 Include waypoints and text file with sendmap
+ * #164 - synchronise death count in resume/frag messages
= Red Eclipse 1.2 =
Gameplay:
diff --git a/guidelines.txt b/guidelines.txt
index 7209fd0..e226669 100644
--- a/guidelines.txt
+++ b/guidelines.txt
@@ -93,7 +93,7 @@ basis.
should result in disciplinary action, and they have the support of their
peers, they should contact the Red Eclipse Team immediately to propose an
amendment.
-
+
* Failure by a moderator to follow or uphold the rules may result in their
access being immediately revoked, without warning.
diff --git a/license.txt b/license.txt
index 84ac890..3e5784e 100644
--- a/license.txt
+++ b/license.txt
@@ -3,10 +3,10 @@ THE RED ECLIPSE LICENSE
Red Eclipse is based on Cube Engine 2, both of which are covered under the ZLIB
license, you may use the source code so long as you obey this license.
- Red Eclipse, Copyright (C) 2009-2012 Quinton Reeves, Lee Salzman
+ Red Eclipse, Copyright (C) 2009-2012 Quinton Reeves, Lee Salzman
Cube Engine 2, Copyright (C) 2001-2012 Wouter van Oortmerssen, Lee Salzman,
Mike Dysart, Robert Pointon, and Quinton Reeves
- http://www.opensource.org/licenses/zlib-license.php
+ http://www.opensource.org/licenses/zlib-license.php
This software is provided 'as-is', without any express or implied warranty.
In no event will the authors be held liable for any damages arising from
@@ -20,7 +20,7 @@ it and redistribute it freely, subject to the following restrictions:
appreciated but is not required.
* Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
- * This notice may not be removed or altered from any source distribution.
+ * This notice may not be removed or altered from any source distribution.
The license covers the source code, shells scripts, and related config files.
The included enet network library is covered by an MIT-style license, which
diff --git a/readme.txt b/readme.txt
index a510fb8..200f938 100644
--- a/readme.txt
+++ b/readme.txt
@@ -86,7 +86,7 @@ Developers
Derek "Favorito" Ponicki - Artist
Maps, Textures, Design and Testing
-
+
Jeroen "appleflap" Boukens - Collaborator
Textures, Design and Testing
@@ -104,7 +104,7 @@ Developers
"SkiingPenguins" - Artist
Skyboxes
-
+
"fluxord" - Artist
Crosshairs
@@ -112,10 +112,10 @@ Developers
Master and Game server hosting
Supporters
-
+
"w00p|dazza", Corey "c0rdawg" Maher, Rob "Lloir" Shannon
Henrik "ahven" Pihl, Robert "Homicidal" Crane, Wayne Bennett,
Cameron "Rhubarb" Dawdy, Christopher "paroneayea" Webber,
Mark "xtort-" Doodeman, Vadim Peretokin, Taiyo Rawle, "CD Xbow",
"FearFighter", Daniel "Imerion" Eriksson, Furor, Gaming Tilt,
- Nick "Fatal_Glory" Watts, Robert Winkler, "fbt", Eddie "skedz4u" Webb
\ No newline at end of file
+ Nick "Fatal_Glory" Watts, Robert Winkler, "fbt", Eddie "skedz4u" Webb
diff --git a/src/game/client.cpp b/src/game/client.cpp
index 484f613..11a2924 100644
--- a/src/game/client.cpp
+++ b/src/game/client.cpp
@@ -1124,6 +1124,7 @@ namespace client
else d->state = getint(p);
d->points = getint(p);
d->frags = getint(p);
+ d->deaths = getint(p);
d->health = getint(p);
d->cptime = getint(p);
if(resume && (d == game::player1 || d->ai))
@@ -1646,7 +1647,7 @@ namespace client
case N_DIED:
{
- int vcn = getint(p), acn = getint(p), frags = getint(p), spree = getint(p), style = getint(p), weap = getint(p), flags = getint(p), damage = getint(p);
+ int vcn = getint(p), deaths = getint(p), acn = getint(p), frags = getint(p), spree = getint(p), style = getint(p), weap = getint(p), flags = getint(p), damage = getint(p);
gameent *victim = game::getclient(vcn), *actor = game::getclient(acn);
static vector<gameent *> assist; assist.setsize(0);
int count = getint(p);
@@ -1657,6 +1658,7 @@ namespace client
if(log) assist.add(log);
}
if(!actor || !victim) break;
+ victim->deaths = deaths;
actor->frags = frags;
actor->spree = spree;
game::killed(weap, flags, damage, victim, actor, assist, style);
diff --git a/src/game/server.cpp b/src/game/server.cpp
index a156651..e78e43f 100644
--- a/src/game/server.cpp
+++ b/src/game/server.cpp
@@ -1564,7 +1564,7 @@ namespace server
}
gs.spawnstate(gamemode, mutators, weap, health);
int spawn = pickspawn(ci);
- sendf(ci->clientnum, 1, "ri9v", N_SPAWNSTATE, ci->clientnum, spawn, gs.state, gs.points, gs.frags, gs.health, gs.cptime, gs.weapselect, WEAP_MAX, &gs.ammo[0]);
+ sendf(ci->clientnum, 1, "ri9iv", N_SPAWNSTATE, ci->clientnum, spawn, gs.state, gs.points, gs.frags, gs.deaths, gs.health, gs.cptime, gs.weapselect, WEAP_MAX, &gs.ammo[0]);
gs.lastrespawn = gs.lastspawn = gamemillis;
}
@@ -1574,6 +1574,7 @@ namespace server
putint(p, gs.state);
putint(p, gs.points);
putint(p, gs.frags);
+ putint(p, gs.deaths);
putint(p, gs.health);
putint(p, gs.cptime);
putint(p, gs.weapselect);
@@ -2611,7 +2612,7 @@ namespace server
void sendresume(clientinfo *ci)
{
servstate &gs = ci->state;
- sendf(-1, 1, "ri8vi", N_RESUME, ci->clientnum, gs.state, gs.points, gs.frags, gs.health, gs.cptime, gs.weapselect, WEAP_MAX, &gs.ammo[0], -1);
+ sendf(-1, 1, "ri9vi", N_RESUME, ci->clientnum, gs.state, gs.points, gs.frags, gs.deaths, gs.health, gs.cptime, gs.weapselect, WEAP_MAX, &gs.ammo[0], -1);
}
void putinitclient(clientinfo *ci, packetbuf &p)
@@ -3014,7 +3015,7 @@ namespace server
dropitems(target, aistyle[target->state.aitype].living ? DROP_DEATH : DROP_EXPIRE);
static vector<int> dmglog; dmglog.setsize(0);
gethistory(target, actor, gamemillis, dmglog, true, 1);
- sendf(-1, 1, "ri9iv", N_DIED, target->clientnum, actor->clientnum, actor->state.frags, actor->state.spree, style, weap, realflags, realdamage, dmglog.length(), dmglog.length(), dmglog.getbuf());
+ sendf(-1, 1, "ri9i2v", N_DIED, target->clientnum, target->state.deaths, actor->clientnum, actor->state.frags, actor->state.spree, style, weap, realflags, realdamage, dmglog.length(), dmglog.length(), dmglog.getbuf());
target->position.setsize(0);
if(smode) smode->died(target, actor);
mutate(smuts, mut->died(target, actor));
@@ -3052,7 +3053,7 @@ namespace server
}
static vector<int> dmglog; dmglog.setsize(0);
gethistory(ci, ci, gamemillis, dmglog, true, 1);
- sendf(-1, 1, "ri9iv", N_DIED, ci->clientnum, ci->clientnum, ci->state.frags, 0, 0, -1, flags, ci->state.health, dmglog.length(), dmglog.length(), dmglog.getbuf());
+ sendf(-1, 1, "ri9i2v", N_DIED, ci->clientnum, ci->state.deaths, ci->clientnum, ci->state.frags, 0, 0, -1, flags, ci->state.health, dmglog.length(), dmglog.length(), dmglog.getbuf());
ci->position.setsize(0);
if(smode) smode->died(ci, NULL);
mutate(smuts, mut->died(ci, NULL));
diff --git a/src/game/waypoint.cpp b/src/game/waypoint.cpp
index 9c3f410..7a650bd 100644
--- a/src/game/waypoint.cpp
+++ b/src/game/waypoint.cpp
@@ -350,7 +350,7 @@ namespace ai
if(wpcachestack.empty()) break;
curnode = wpcachestack.pop();
}
- for(int i = lastwpcache; i < waypoints.length(); i++) { CHECKNEAR(i); }
+ for(int i = lastwpcache; i < ai::waypoints.length(); i++) { CHECKNEAR(i); }
}
int avoidset::remap(gameent *d, int n, vec &pos, bool retry)
diff --git a/src/install/nix/redeclipse_x128.png b/src/install/nix/redeclipse_x128.png
new file mode 100644
index 0000000..2e51a7f
Binary files /dev/null and b/src/install/nix/redeclipse_x128.png differ
diff --git a/src/install/nix/redeclipse_x16.png b/src/install/nix/redeclipse_x16.png
new file mode 100644
index 0000000..65bcf75
Binary files /dev/null and b/src/install/nix/redeclipse_x16.png differ
diff --git a/src/install/nix/redeclipse_x32.png b/src/install/nix/redeclipse_x32.png
new file mode 100644
index 0000000..4975db2
Binary files /dev/null and b/src/install/nix/redeclipse_x32.png differ
diff --git a/src/install/nix/redeclipse_x32.xpm b/src/install/nix/redeclipse_x32.xpm
new file mode 100644
index 0000000..4785445
--- /dev/null
+++ b/src/install/nix/redeclipse_x32.xpm
@@ -0,0 +1,156 @@
+/* XPM */
+static char *redeclipse_x32[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 118 2 ",
+" c black",
+". c #010100000000",
+"X c #020200000000",
+"o c #030300000000",
+"O c #040400000000",
+"+ c #050500000000",
+"@ c #060600000000",
+"# c #070700000000",
+"$ c #070702020000",
+"% c #080800000000",
+"& c #090900000000",
+"* c #0A0A00000000",
+"= c #0B0B00000000",
+"- c #0C0C00000000",
+"; c #0D0D00000000",
+": c #0C0C01010000",
+"> c #0E0E00000000",
+", c #0F0F00000000",
+"< c #0D0D02020101",
+"1 c #101000000000",
+"2 c #111100000000",
+"3 c #121200000000",
+"4 c #141400000000",
+"5 c #151500000000",
+"6 c #171700000000",
+"7 c #121205050202",
+"8 c #181800000000",
+"9 c #1B1B00000000",
+"0 c #1C1C00000000",
+"q c #1D1D00000000",
+"w c #1E1E00000000",
+"e c #1F1F00000000",
+"r c #191905050303",
+"t c #1D1D0B0B0404",
+"y c #202000000000",
+"u c #222200000000",
+"i c #252500000000",
+"p c #262600000000",
+"a c #252502020202",
+"s c #242404040404",
+"d c #282800000000",
+"f c #2B2B00000000",
+"g c #2E2E07070101",
+"h c #2B2B0D0D0404",
+"j c #333300000000",
+"k c #333301010101",
+"l c #373700000000",
+"z c #373701010101",
+"x c #313104040101",
+"c c #3E3E00000000",
+"v c #414100000000",
+"b c #404003030202",
+"n c #444400000000",
+"m c #474700000000",
+"M c #484803030202",
+"N c #737309090202",
+"B c #767608080202",
+"V c #707018181717",
+"C c #73731A1A1919",
+"Z c #7E7E1B1B1B1B",
+"A c #838307070505",
+"S c #8C8C01010202",
+"D c #8D8D08080202",
+"F c #939305050202",
+"G c #A3A308080909",
+"H c #B5B510100F0F",
+"J c #87872C2C2C2C",
+"K c #92923E3E3E3E",
+"L c #DFDF07070404",
+"P c #DFDF0A0A0303",
+"I c #E4E407070404",
+"U c #FDFD00000000",
+"Y c #FEFE00000000",
+"T c red",
+"R c #FEFE01010101",
+"E c #FEFE02020202",
+"W c #FEFE28282828",
+"Q c #FDFD32323232",
+"! c #FEFE39393939",
+"~ c #FFFF39393939",
+"^ c #929244444343",
+"/ c #989848484848",
+"( c #989852525353",
+") c #A7A75E5E5F5F",
+"_ c #B5B56A6A6A6A",
+"` c #FEFE41414141",
+"' c #FEFE56565656",
+"] c #FEFE57575757",
+"[ c #FEFE69696969",
+"{ c #FFFF76767676",
+"} c #FEFE78787878",
+"| c #CACA8D8D8D8D",
+" . c #CECE93939393",
+".. c #D2D299999999",
+"X. c #FEFE83838383",
+"o. c #FEFE9B9B9B9B",
+"O. c #FEFEA0A0A0A0",
+"+. c #FEFEACACACAC",
+"@. c #E9E9BEBEBEBE",
+"#. c #FEFEB6B6B6B6",
+"$. c #FEFEBFBFBFBF",
+"%. c #FEFEC5C5C5C5",
+"&. c #F0F0CFCFCFCF",
+"*. c #F7F7DFDFDFDF",
+"=. c #FFFFE1E1E1E1",
+"-. c #FEFEE4E4E4E4",
+";. c #FEFEE7E7E7E7",
+":. c #FEFEE9E9E9E9",
+">. c #FBFBECECECEC",
+",. c #FEFEFAFAFAFA",
+"<. c #FEFEFDFDFDFD",
+"1. c #FDFDFEFEFEFE",
+"2. c #FDFDFFFFFFFF",
+"3. c #FEFEFEFEFEFE",
+"4. c #FFFFFEFEFEFE",
+"5. c #FEFEFFFFFFFF",
+"6. c gray100",
+"7. c None",
+/* pixels */
+"7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.",
+"7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.",
+"7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.",
+"7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.",
+"7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.",
+"7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.",
+"7.7.7.7.7.7.7.7.7.7.7.7.X.O.o.} W 7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.",
+"7.7.7.7.7.7.7.7.7.Q %.4.4.4.2.4.4.%.! 7.7.7.7.7.7.7.7.7.7.7.7.7.",
+"7.7.7.7.7.7.7.7.] 4.4.2.4.4.4.4.4.4.4.{ 7.7.7.7.7.7.7.7.7.7.7.7.",
+"7.7.7.7.7.7.7.` 4.4.4.4.4.4. at ._ J V C ^ H 7.7.7.7.7.7.7.7.7.7.7.",
+"7.7.7.7.7.7.Y -.4.2.4.4.&.Z j i y y 9 9 w c A 7.7.7.7.7.7.7.7.7.",
+"7.7.7.7.Y Y [ 4.4.4.4. .m d i w 6 3 3 > % 3 w M L 7.7.7.7.7.7.7.",
+"7.7.7.Y Y Y #.4.2.4...z i w 6 > > > % % % > % 3 z I 7.7.7.7.7.7.",
+"7.7.7.Y Y Y :.4.4.*.c d 9 6 > % % > % # # % % % % b 7.7.7.7.7.7.",
+"7.7.7.7.Y Y ,.4.4.K i 9 > # # # # # % % # o o o o % F 7.7.7.7.7.",
+"7.7.7.7.Y Y :.4.>.c w 6 % % % # % # # % o # o o o o x Y 7.7.7.7.",
+"7.7.7.7.Y Y +.4.| d 9 > % # # # % # o o o o o o o o o L 7.7.7.7.",
+"7.7.7.7.7.Y ] 4.) i 6 > # # % % % # o o o o o o o o o D 7.7.7.7.",
+"7.7.7.7.7.Y E =./ w 9 % # # % # o o o o o o o o o o o N 7.7.7.7.",
+"7.7.7.7.7.7.7.~ ( w 3 % # # % o o o o o o o o o o o o N 7.7.7.7.",
+"7.7.7.7.7.7.7.7.G w > % % # # o o o o o o o o o o o o 7.7.7.7.7.",
+"7.7.7.7.7.7.7.7.7.i 3 > % # o o o o o o o o o o o o % 7.7.7.7.7.",
+"7.7.7.7.7.7.7.7.7.n > % % # o o o o o o o o o o o o g 7.7.7.7.7.",
+"7.7.7.7.7.7.7.7.7.S 6 % # o o o o o o o o o o o o o 7.7.7.7.7.7.",
+"7.7.7.7.7.7.7.7.7.7.z > # o o o o o o o o o o o o 7.7.7.7.7.7.7.",
+"7.7.7.7.7.7.7.7.7.7.7.s # o o o o o o o o o o o h 7.7.7.7.7.7.7.",
+"7.7.7.7.7.7.7.7.7.7.7.7.s % o o o o o o o o $ 7.7.7.7.7.7.7.7.7.",
+"7.7.7.7.7.7.7.7.7.7.7.7.7.7.r > o o o o 7 t 7.7.7.7.7.7.7.7.7.7.",
+"7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.",
+"7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.",
+"7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.",
+"7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7.7."
+};
diff --git a/src/install/nix/redeclipse_x48.png b/src/install/nix/redeclipse_x48.png
new file mode 100644
index 0000000..149ed5e
Binary files /dev/null and b/src/install/nix/redeclipse_x48.png differ
diff --git a/src/install/nix/redeclipse_x64.png b/src/install/nix/redeclipse_x64.png
new file mode 100644
index 0000000..f5f6c3f
Binary files /dev/null and b/src/install/nix/redeclipse_x64.png differ
diff --git a/src/system-install.mk b/src/system-install.mk
index ac78211..3d3a18d 100644
--- a/src/system-install.mk
+++ b/src/system-install.mk
@@ -14,13 +14,15 @@ docdir=$(DESTDIR)$(prefix)/share/doc
mandir=$(DESTDIR)$(prefix)/share/man
menudir=$(DESTDIR)$(prefix)/share/applications
icondir=$(DESTDIR)$(prefix)/share/icons/hicolor
+pixmapdir=$(DESTDIR)$(prefix)/share/pixmaps
ICONS= \
install/nix/$(appsrcname)_x16.png \
install/nix/$(appsrcname)_x32.png \
install/nix/$(appsrcname)_x48.png \
install/nix/$(appsrcname)_x64.png \
- install/nix/$(appsrcname)_x128.png
+ install/nix/$(appsrcname)_x128.png \
+ install/nix/$(appsrcname)_x32.xpm
install/nix/$(appsrcname)_x16.png: $(appsrcname).ico
convert '$(appsrcname).ico[0]' $@
@@ -37,6 +39,9 @@ install/nix/$(appsrcname)_x64.png: $(appsrcname).ico
install/nix/$(appsrcname)_x128.png: $(appsrcname).ico
convert '$(appsrcname).ico[3]' $@
+install/nix/$(appsrcname)_x32.xpm: $(appsrcname).ico
+ convert '$(appsrcname).ico[1]' $@
+
icons: $(ICONS)
system-install-client: client
@@ -98,6 +103,7 @@ system-install-menus: icons
install -d $(icondir)/48x48/apps
install -d $(icondir)/64x64/apps
install -d $(icondir)/128x128/apps
+ install -d $(pixmapdir)
sed -e 's, at LIBEXECDIR@,$(patsubst $(DESTDIR)%,%,$(libexecdir)),g' \
-e 's, at DATADIR@,$(patsubst $(DESTDIR)%,%,$(datadir)),g' \
-e 's, at DOCDIR@,$(patsubst $(DESTDIR)%,%,$(docdir)),g' \
@@ -114,6 +120,8 @@ system-install-menus: icons
$(icondir)/64x64/apps/$(appname).png
install -m644 install/nix/$(appsrcname)_x128.png \
$(icondir)/128x128/apps/$(appname).png
+ install -m644 install/nix/$(appsrcname)_x32.xpm \
+ $(pixmapdir)/$(appname).xpm
system-install-cube2font: system-install-cube2font-docs
install -d $(bindir)
--
Packaging for Red Eclipse
More information about the Pkg-games-commits
mailing list