Menu
▾
▴
raceintospace-cvs — CVS commits on RACE module
You can subscribe to this list here.
| 2007 |
Jan
(89) |
Feb
(63) |
Mar
(13) |
Apr
(2) |
May
(6) |
Jun
(2) |
Jul
(20) |
Aug
(30) |
Sep
(17) |
Oct
|
Nov
(6) |
Dec
(3) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
(17) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(2) |
| 2010 |
Jan
(1) |
Feb
(8) |
Mar
(1) |
Apr
(3) |
May
|
Jun
(3) |
Jul
(1) |
Aug
(6) |
Sep
(3) |
Oct
(5) |
Nov
|
Dec
(1) |
| 2011 |
Jan
(2) |
Feb
|
Mar
|
Apr
(2) |
May
(3) |
Jun
(22) |
Jul
(3) |
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
(3) |
Apr
(6) |
May
|
Jun
|
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
(1) |
Apr
(3) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Krzysztof A. KoÅc. <dr...@us...> - 2013-04-18 21:12:48
|
Update of /cvsroot/raceintospace/race In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv7937 Modified Files: ChangeLog version.c Log Message: 2013-04-19 Krzysztof Kosciuszkiewicz <dr...@us...> * V286 * os_win32/configure.mingw: fix option for sdl prefix Index: ChangeLog =================================================================== RCS file: /cvsroot/raceintospace/race/ChangeLog,v retrieving revision 1.280 retrieving revision 1.281 diff -u -d -r1.280 -r1.281 --- ChangeLog 18 Apr 2013 12:51:14 -0000 1.280 +++ ChangeLog 18 Apr 2013 21:12:46 -0000 1.281 @@ -1,3 +1,9 @@ +2013-04-19 Krzysztof Kosciuszkiewicz <dr...@us...> + + * V286 + + * os_win32/configure.mingw: fix option for sdl prefix + 2013-04-18 Pace Willisson <pa...@al...> * V285 Index: version.c =================================================================== RCS file: /cvsroot/raceintospace/race/version.c,v retrieving revision 1.270 retrieving revision 1.271 diff -u -d -r1.270 -r1.271 --- version.c 18 Apr 2013 12:51:14 -0000 1.270 +++ version.c 18 Apr 2013 21:12:46 -0000 1.271 @@ -1 +1 @@ -285 +286 |
|
From: Pace W. <pa...@us...> - 2013-04-18 12:51:17
|
Update of /cvsroot/raceintospace/race In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6355 Modified Files: ChangeLog configure.in version.c Log Message: 2013-04-18 Pace Willisson <pa...@al...> * V285 * update version number in debian build * V284 * fix compiler warning in commented out code Index: ChangeLog =================================================================== RCS file: /cvsroot/raceintospace/race/ChangeLog,v retrieving revision 1.279 retrieving revision 1.280 diff -u -d -r1.279 -r1.280 --- ChangeLog 18 Apr 2013 12:43:16 -0000 1.279 +++ ChangeLog 18 Apr 2013 12:51:14 -0000 1.280 @@ -1,5 +1,9 @@ 2013-04-18 Pace Willisson <pa...@al...> + * V285 + + * update version number in debian build + * V284 * fix compiler warning in commented out code Index: version.c =================================================================== RCS file: /cvsroot/raceintospace/race/version.c,v retrieving revision 1.269 retrieving revision 1.270 diff -u -d -r1.269 -r1.270 --- version.c 18 Apr 2013 12:43:16 -0000 1.269 +++ version.c 18 Apr 2013 12:51:14 -0000 1.270 @@ -1 +1 @@ -284 +285 Index: configure.in =================================================================== RCS file: /cvsroot/raceintospace/race/configure.in,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- configure.in 23 Feb 2011 12:35:34 -0000 1.26 +++ configure.in 18 Apr 2013 12:51:14 -0000 1.27 @@ -2,7 +2,7 @@ dnl === Initialize autoconf === dnl =========================== -AC_INIT(Race Into Space,1.0.0,mkm...@ra...,raceintospace) +AC_INIT(Race Into Space,1.1.0,mkm...@ra...,raceintospace) AC_CONFIG_MACRO_DIR([m4]) |
|
From: Pace W. <pa...@us...> - 2013-04-18 12:43:18
|
Update of /cvsroot/raceintospace/race In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6021 Modified Files: ChangeLog options.c version.c Log Message: 2013-04-18 Pace Willisson <pa...@al...> * V284 * fix compiler warning in commented out code Index: options.c =================================================================== RCS file: /cvsroot/raceintospace/race/options.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- options.c 4 Mar 2012 22:54:57 -0000 1.29 +++ options.c 18 Apr 2013 12:43:16 -0000 1.30 @@ -57,7 +57,7 @@ # if HAVE_SDL_GETENV # define getenv SDL_getenv # else -# warn I don't know a way to read environment on this system +# warn I do not know a way to read environment on this system # define getenv(a) (NULL) # endif #endif Index: version.c =================================================================== RCS file: /cvsroot/raceintospace/race/version.c,v retrieving revision 1.268 retrieving revision 1.269 diff -u -d -r1.268 -r1.269 --- version.c 16 Mar 2013 15:35:02 -0000 1.268 +++ version.c 18 Apr 2013 12:43:16 -0000 1.269 @@ -1 +1 @@ -283 +284 Index: ChangeLog =================================================================== RCS file: /cvsroot/raceintospace/race/ChangeLog,v retrieving revision 1.278 retrieving revision 1.279 diff -u -d -r1.278 -r1.279 --- ChangeLog 16 Mar 2013 15:35:02 -0000 1.278 +++ ChangeLog 18 Apr 2013 12:43:16 -0000 1.279 @@ -1,3 +1,9 @@ +2013-04-18 Pace Willisson <pa...@al...> + + * V284 + + * fix compiler warning in commented out code + 2013-03-16 Leon Baradat <pe...@us...> * V283 |
|
From: Leon B. <pe...@us...> - 2013-03-16 15:35:05
|
Update of /cvsroot/raceintospace/race In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv24675/race Modified Files: ChangeLog version.c Log Message: Minor update to 'naut roster Index: version.c =================================================================== RCS file: /cvsroot/raceintospace/race/version.c,v retrieving revision 1.267 retrieving revision 1.268 diff -u -d -r1.267 -r1.268 --- version.c 31 Aug 2012 03:13:07 -0000 1.267 +++ version.c 16 Mar 2013 15:35:02 -0000 1.268 @@ -1 +1 @@ -282 +283 Index: ChangeLog =================================================================== RCS file: /cvsroot/raceintospace/race/ChangeLog,v retrieving revision 1.277 retrieving revision 1.278 diff -u -d -r1.277 -r1.278 --- ChangeLog 31 Aug 2012 03:13:07 -0000 1.277 +++ ChangeLog 16 Mar 2013 15:35:02 -0000 1.278 @@ -1,3 +1,9 @@ +2013-03-16 Leon Baradat <pe...@us...> + + * V283 + + * Minor update to 'naut roster + 2012-08-30 Leon Baradat <pe...@us...> * V282 |
|
From: Leon B. <pe...@us...> - 2012-08-31 03:13:09
|
Update of /cvsroot/raceintospace/race
In directory vz-cvs-4.sog:/tmp/cvs-serv14152/race
Modified Files:
ChangeLog ast4.c endgame.c place.c vab.c version.c
Log Message:
More/improved visual cues
Index: endgame.c
===================================================================
RCS file: /cvsroot/raceintospace/race/endgame.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- endgame.c 19 Aug 2012 22:18:12 -0000 1.23
+++ endgame.c 31 Aug 2012 03:13:07 -0000 1.24
@@ -46,7 +46,7 @@
"TWO-PERSON CRAFT","THREE-PERSON CRAFT","MINISHUTTLE","FOUR-PERSON CRAFT",
"MANNED ORBITAL","MANNED LUNAR PASS","MANNED LUNAR ORBIT",
"MANNED RESCUE ATTEMPT","MANNED LUNAR LANDING","ORBITING LAB",
- "MANNED DOCKING","WOMAN IN SPACE","SPACE WALK","MANNED SPACE MISSION"};
+ "MANNED DOCKING","WOMAN IN SPACE","SPACEWALK","MANNED SPACE MISSION"};
char
Index: ChangeLog
===================================================================
RCS file: /cvsroot/raceintospace/race/ChangeLog,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -d -r1.276 -r1.277
--- ChangeLog 19 Aug 2012 22:18:12 -0000 1.276
+++ ChangeLog 31 Aug 2012 03:13:07 -0000 1.277
@@ -1,3 +1,13 @@
+2012-08-30 Leon Baradat <pe...@us...>
+
+ * V282
+
+ * vab.c: Corrected VAB/VIB showing "RROCKET" which was introduced in V281
+
+ * endgame.c: Small wording change: SPACEWALK
+
+ * ast4.c, place.c: More/improved visual cues
+
2012-08-19 Leon Baradat <pe...@us...>
* V281
Index: vab.c
===================================================================
RCS file: /cvsroot/raceintospace/race/vab.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- vab.c 19 Aug 2012 22:18:12 -0000 1.37
+++ vab.c 31 Aug 2012 03:13:07 -0000 1.38
@@ -177,7 +177,7 @@
PrintAt(42,160,"L.M.:");
PrintAt(16,172,"PAYLOAD:");
grSetColor(9); PrintAt(22,188,"R");
- grSetColor(1); PrintAt(0,0,"ROCKET: ");
+ grSetColor(1); PrintAt(0,0,"OCKET: ");
Name[0]='A'+pad; Name[1]=0x00;
InBox(4,27,166,37);RectFill(5,28,165,36,10);
Index: place.c
===================================================================
RCS file: /cvsroot/raceintospace/race/place.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- place.c 30 Sep 2011 04:08:28 -0000 1.40
+++ place.c 31 Aug 2012 03:13:07 -0000 1.41
@@ -613,7 +613,7 @@
char w=0,i,draw=0;
extern char PF[29][40];
for (i=0;i<28;i++)
- { //Preestige First
+ { //Prestige Firsts
if (w<6 && Data->Prestige[i].Place==index && Data->PD[index][i]==0)
{
if (draw==0) {
@@ -755,7 +755,8 @@
AbzFrame(plr,index,215,56,94,60,"OOOO",mode);
- IOBox(214,134,310,148);grSetColor(1);PrintAt(224,143,"REPLAY MISSION");
+ IOBox(214,134,310,148); grSetColor(9);PrintAt(224,143,"R");
+ grSetColor(1);PrintAt(0,0,"EPLAY MISSION");
if (mode==0) {
IOBox(214,151,310,165);
grSetColor(1);PrintAt(250,160,"EXIT");
Index: ast4.c
===================================================================
RCS file: /cvsroot/raceintospace/race/ast4.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- ast4.c 24 Oct 2010 15:14:09 -0000 1.25
+++ ast4.c 31 Aug 2012 03:13:07 -0000 1.26
@@ -215,12 +215,14 @@
if (prog>=3) ShBox(4,104,12,110);
if (prog==5) ShBox(4,113,12,119);
FlagSm(plr,4,4);
- grSetColor(1);
- PrintAt(250,96,"ASSIGN CREW");
- PrintAt(252,114,"BREAK CREW");
+ grSetColor(9); PrintAt(250,96,"A");
+ grSetColor(1); PrintAt(0,0,"SSIGN CREW");
+ grSetColor(9); PrintAt(252,114,"B");
+ grSetColor(1); PrintAt(0,0,"REAK CREW");
PrintAt(258,13,"CONTINUE");
- grSetColor(5);
- PrintAt(183,133,"FLIGHT CREW SELECTION");
+ grSetColor(5); PrintAt(183,133,"FLIGHT ");
+ grSetColor(9); PrintAt(0,0,"C");
+ grSetColor(5); PrintAt(0,0,"REW SELECTION");
grSetColor(7);
PrintAt(152,35,&Data->P[plr].Manned[prog-1].Name[0]);
grSetColor(9);
Index: version.c
===================================================================
RCS file: /cvsroot/raceintospace/race/version.c,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -d -r1.266 -r1.267
--- version.c 19 Aug 2012 22:18:12 -0000 1.266
+++ version.c 31 Aug 2012 03:13:07 -0000 1.267
@@ -1 +1 @@
-281
+282
|
|
From: Leon B. <pe...@us...> - 2012-08-19 22:18:15
|
Update of /cvsroot/raceintospace/race
In directory vz-cvs-4.sog:/tmp/cvs-serv12219/race
Modified Files:
ChangeLog endgame.c hardef.c rdplex.c vab.c version.c
Log Message:
More/improved visual cues in R&D/Purchasing and VAB/VIB screens
Index: endgame.c
===================================================================
RCS file: /cvsroot/raceintospace/race/endgame.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- endgame.c 25 Jun 2011 20:07:10 -0000 1.22
+++ endgame.c 19 Aug 2012 22:18:12 -0000 1.23
@@ -212,7 +212,7 @@
if (win==0) DispBig(34,5,"US WINS",1,-1);
else DispBig(34,5,"USSR WINS",1,-1);
FlagSm(win,4,4);
- grSetColor(1);PrintAt(258,13,"CONTINUE");
+ grSetColor(1);PrintAt(256,13,"CONTINUE");
if (Option==-1 && MAIL==-1) miss=Data->P[win].Mission[pad].MissionCode;
else {
@@ -312,7 +312,7 @@
default:break;
}
}
- //Print the first in the moon
+ //Print the first on the Moon
firstOnMoon = (manOnMoon==1? man1 : manOnMoon==2? man2 : manOnMoon==3? man3 :manOnMoon==4? man4: man2);
grSetColor(11);PrintAt(10,60,"FIRST ON THE MOON: ");grSetColor(14);PrintAt(0,0,&Data->P[win].Pool[firstOnMoon].Name[0]);
@@ -764,7 +764,7 @@
/*
* off by one error in data file - again
* P.w += 1 solves the problem, but then
- * we get a strip of garbage on the right hand side
+ * we get a strip of garbage on the right-hand side
*/
P.w++;
fseek(in, P.offset, SEEK_SET);
Index: ChangeLog
===================================================================
RCS file: /cvsroot/raceintospace/race/ChangeLog,v
retrieving revision 1.275
retrieving revision 1.276
diff -u -d -r1.275 -r1.276
--- ChangeLog 26 Apr 2012 04:36:01 -0000 1.275
+++ ChangeLog 19 Aug 2012 22:18:12 -0000 1.276
@@ -1,3 +1,11 @@
+2012-08-19 Leon Baradat <pe...@us...>
+
+ * V281
+
+ * endgame.c: Centered "CONTINUE" in end-game screen
+
+ * hardef.c, rdplex.c, vab.c: More/improved visual cues in R&D/Purchasing and VAB/VIB screens
+
2012-04-25 Leon Baradat <pe...@us...>
* V280
Index: rdplex.c
===================================================================
RCS file: /cvsroot/raceintospace/race/rdplex.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- rdplex.c 18 Apr 2012 02:02:54 -0000 1.30
+++ rdplex.c 19 Aug 2012 22:18:12 -0000 1.31
@@ -160,8 +160,10 @@
//GradRect(27,95,130,171,player_index*16+128);
RectFill(27,95,130,171,0);
+ grSetColor(9);
+ PrintAt(13,80,"V");
grSetColor(1);
- PrintAt(13,80,"VISIT PURCHASING FACILITY");
+ PrintAt(0,0,"ISIT PURCHASING FACILITY");
for (i=0;i<6;i++)
gxVirtualDisplay(&mans,i*20,0,166+i*26,158,184+i*26,174,0);
@@ -247,7 +249,11 @@
if (diceRoll == 0)
{
- PrintAt(169, 191, "RESEARCH PROGRAM FOR ");
+ PrintAt(169, 191, "RE");
+ grSetColor(9);
+ PrintAt(0,0,"S");
+ grSetColor(1);
+ PrintAt(0,0,"EARCH PROGRAM FOR ");
grSetColor(9);
DispNum(0, 0, cost);
grSetColor(1);
@@ -637,14 +643,15 @@
if (Data->P[player_index].RDMods != 0)
{
- PrintAt(170,153,"RESEARCH ");
if (Data->P[player_index].RDMods > 0)
- { PrintAt(0,0,"STRONG: ");
- RectFill(264,149,264,153,1); RectFill(262,151,266,151,1); // This is to fake a plus sign, which the game apparently can't draw -Leon
+ { grSetColor(5);
+ PrintAt(170,153,"RESEARCH STRONG: ");
+ RectFill(264,149,264,153,5); RectFill(262,151,266,151,5); // This fakes a plus sign, which the game apparently can't draw -Leon
}
else
{
- PrintAt(0,0,"WEAK: ");
+ grSetColor(8);
+ PrintAt(170,153,"RESEARCH WEAK: ");
}
DispNum(0,0,Data->P[player_index].RDMods);
PrintAt(0,0,"%/TEAM");
@@ -790,16 +797,20 @@
RectFill(27,95,130,171,0);
LTArrow(24,186);RTArrow(101,186);
+ grSetColor(9);
+ PrintAt(34,80,"V");
grSetColor(1);
- PrintAt(34,80,"VISIT R&D FACILITY");
+ PrintAt(0,0,"ISIT R&D FACILITY");
gxVirtualDisplay(&but,0,0,8,30,74,59,0); // Unmanned
gxVirtualDisplay(&but,68,0,84,30,155,59,0); // Rocket
gxVirtualDisplay(&but,141,0,165,30,236,59,0);// Manned
gxVirtualDisplay(&but,214,0,246,30,312,59,0);// Misc
+ grSetColor(9);
+ PrintAt(191,190,"P");
grSetColor(11);
- PrintAt(191,190,"PURCHASE EQUIPMENT");
+ PrintAt(0,0,"URCHASE EQUIPMENT");
if (Data->Season==0) PrintAt(158,8,"SPRING");
else PrintAt(162,8,"FALL");
Index: vab.c
===================================================================
RCS file: /cvsroot/raceintospace/race/vab.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- vab.c 26 May 2011 13:08:19 -0000 1.36
+++ vab.c 19 Aug 2012 22:18:12 -0000 1.37
@@ -39,8 +39,8 @@
struct VInfo VAS[7][4];
char VASqty,CV;
extern struct mStr Mis;
- extern char Vab_Spot;
- int TotalCost; char hasDelay;//Used to display the cost of autopurchase
+ extern char Vab_Spot;
+ int TotalCost; char hasDelay; //Used to display the cost of autopurchase
// CAP,LM,SDM,DMO,EVA,PRO,INT,KIC
char isDamaged[8] = {0,0,0,0,0,0,0,0};
@@ -162,15 +162,22 @@
IOBox(4,84,165,96);
+ grSetColor(9);
+ PrintAt(200,192,"E");
grSetColor(1);
- PrintAt(200,192,"EXIT");
- PrintAt(268,192,"SCRUB");
+ PrintAt(0,0,"XIT");
+ grSetColor(9);
+ PrintAt(268,192,"S");
+ grSetColor(1);
+ PrintAt(0,0,"CRUB");
PrintAt(263,13,"ASSIGN");
- PrintAt(18,136,"PRIMARY:");
+ grSetColor(9); PrintAt(18,136,"P");
+ grSetColor(1); PrintAt(0,0,"RIMARY:");
PrintAt(24,148,"KICKER:");
PrintAt(42,160,"L.M.:");
PrintAt(16,172,"PAYLOAD:");
- PrintAt(22,188,"ROCKET: ");
+ grSetColor(9); PrintAt(22,188,"R");
+ grSetColor(1); PrintAt(0,0,"ROCKET: ");
Name[0]='A'+pad; Name[1]=0x00;
InBox(4,27,166,37);RectFill(5,28,165,36,10);
@@ -620,7 +627,7 @@
char Name[8][12],ButOn,temp;
FILE* file;
int MI_size = sizeof (struct MDA) * 28 * 2;
-
+
file = sOpen("VTABLE.DAT", "rb", 0);
fread(MI, MI_size, 1, file);
@@ -680,7 +687,7 @@
// Rocket Display Data --------------------------
for (i=0;i<7;i++) {
if (i>3) {
- isDamaged[i] = Data->P[plr].Rocket[i-4].Damage!=0?1:0;
+ isDamaged[i] = Data->P[plr].Rocket[i-4].Damage!=0?1:0;
sf[i] = RocketBoosterSafety(Data->P[plr].Rocket[i-4].Safety, Data->P[plr].Rocket[4].Safety);
strcpy(&Name[i][0],"B/");
strcat(&Name[i][0],&Data->P[plr].Rocket[i-4].Name[0]);
@@ -709,21 +716,23 @@
DispRck(plr,rk);
DispVA(plr,ccc);
cwt=0;for (i=0;i<4;i++) cwt+=VAS[ccc][i].wt;
- DispWts(cwt,pay[rk]);
-
- //display cost (XX of XX)
- hasDelay=0;
+ DispWts(cwt,pay[rk]);
+
+ //display cost (XX of XX)
+ hasDelay=0;
TotalCost=0;
hasDelay=ChkDelVab(plr,ccc);
if (hasDelay!=0) hasDelay=ChkVabRkt(plr,rk,&qty[0]);
TotalCost=FillVab(plr,ccc,0);
- TotalCost+=BuyVabRkt(plr,rk,&qty[0],0);
+ TotalCost+=BuyVabRkt(plr,rk,&qty[0],0);
RectFill(7,87,162,93,3);
- grSetColor(1); if (hasDelay==0 || TotalCost>Data->P[plr].Cash) grSetColor(9); //if cant buy (delay, cost>cash) ->red letters
- PrintAt(13,92,"AUTOPURCHASE (");
- DispNum(0,0,TotalCost);
+ grSetColor(9);
+ PrintAt(13,92,"A");
+ grSetColor(1); if (hasDelay==0 || TotalCost>Data->P[plr].Cash) grSetColor(9); //if can't buy (delay, cost>cash) ->red letters
+ PrintAt(0,0,"UTOPURCHASE (");
+ DispNum(0,0,TotalCost);
PrintAt(0,0," OF ");
- DispMB(0,0,Data->P[plr].Cash);
+ DispMB(0,0,Data->P[plr].Cash);
PrintAt(0,0,")");
FadeIn(2,pal,10,0,0);
@@ -731,7 +740,7 @@
while (1)
{
key=0;GetMouse();
- if (mousebuttons > 0 || key>0) /* Game Play */
+ if (mousebuttons > 0 || key>0) /* Gameplay */
{
// AUTOPURCHASE
@@ -754,7 +763,7 @@
// Rocket Display Data --------------------------
for (i=0;i<7;i++) {
if (i>3) {
- isDamaged[i] = Data->P[plr].Rocket[i-4].Damage!=0?1:0;
+ isDamaged[i] = Data->P[plr].Rocket[i-4].Damage!=0?1:0;
sf[i] = RocketBoosterSafety(Data->P[plr].Rocket[i-4].Safety, Data->P[plr].Rocket[4].Safety);
strcpy(&Name[i][0],"B/");
strcat(&Name[i][0],&Data->P[plr].Rocket[i-4].Name[0]);
@@ -770,19 +779,20 @@
pay[i]=Data->P[plr].Rocket[i].MaxPay;
}
}
- //display cost (XX of XX)
- hasDelay=0;
+ //display cost (XX of XX)
+ hasDelay=0;
TotalCost=0;
hasDelay=ChkDelVab(plr,ccc);
if (hasDelay!=0) hasDelay=ChkVabRkt(plr,rk,&qty[0]);
TotalCost=FillVab(plr,ccc,0);
- TotalCost+=BuyVabRkt(plr,rk,&qty[0],0);
+ TotalCost+=BuyVabRkt(plr,rk,&qty[0],0);
RectFill(7,87,162,93,3);
- grSetColor(1); if (hasDelay==0 || TotalCost>Data->P[plr].Cash) grSetColor(9); //if cant buy (delay, cost>cash) ->red letters
- PrintAt(13,92,"AUTOPURCHASE (");
- DispNum(0,0,TotalCost);
+ grSetColor(9); PrintAt(13,92,"A");
+ grSetColor(1); if (hasDelay==0 || TotalCost>Data->P[plr].Cash) grSetColor(9); //if can't buy (delay, cost>cash) ->red letters
+ PrintAt(0,0,"UTOPURCHASE (");
+ DispNum(0,0,TotalCost);
PrintAt(0,0," OF ");
- DispMB(0,0,Data->P[plr].Cash);
+ DispMB(0,0,Data->P[plr].Cash);
PrintAt(0,0,")");
}
else if (ac==0) Help("i135"); // delay on purchase
@@ -884,21 +894,23 @@
if (rk>6) rk=0;
if (((Misdef(mis)>=42 && Misdef(mis)<=57) || (Misdef(mis)>=7 && Misdef(mis)<=13)) && (rk==4 || rk==0))
if (options.cheat_altasOnMoon==0) rk++;
-
- //display cost (XX of XX)
- hasDelay=0;
+
+ //display cost (XX of XX)
+ hasDelay=0;
TotalCost=0;
hasDelay=ChkDelVab(plr,ccc);
if (hasDelay!=0) hasDelay=ChkVabRkt(plr,rk,&qty[0]);
TotalCost=FillVab(plr,ccc,0);
- TotalCost+=BuyVabRkt(plr,rk,&qty[0],0);
+ TotalCost+=BuyVabRkt(plr,rk,&qty[0],0);
RectFill(7,87,162,93,3);
- grSetColor(1); if (hasDelay==0 || TotalCost>Data->P[plr].Cash) grSetColor(9); //if cant buy (delay, cost>cash) ->red letters
- PrintAt(13,92,"AUTOPURCHASE (");
- DispNum(0,0,TotalCost);
+ grSetColor(9);
+ PrintAt(13,92,"A");
+ grSetColor(1); if (hasDelay==0 || TotalCost>Data->P[plr].Cash) grSetColor(9); //if can't buy (delay, cost>cash) ->red letters
+ PrintAt(0,0,"UTOPURCHASE (");
+ DispNum(0,0,TotalCost);
PrintAt(0,0," OF ");
- DispMB(0,0,Data->P[plr].Cash);
- PrintAt(0,0,")");
+ DispMB(0,0,Data->P[plr].Cash);
+ PrintAt(0,0,")");
ShowRkt(&Name[rk][0],sf[rk],qty[rk],pay[rk]<wgt,isDamaged[rk]);
DispWts(cwt,pay[rk]);
@@ -915,20 +927,22 @@
ccc++; if (ccc>VASqty) ccc=0;
cwt=0;for (i=0;i<4;i++) cwt+=VAS[ccc][i].wt;
ShowVA(ccc);DispWts(cwt,pay[rk]);
- DispVA(plr,ccc);
- //display cost (XX of XX)
- hasDelay=0;
+ DispVA(plr,ccc);
+ //display cost (XX of XX)
+ hasDelay=0;
TotalCost=0;
hasDelay=ChkDelVab(plr,ccc);
if (hasDelay!=0) hasDelay=ChkVabRkt(plr,rk,&qty[0]);
TotalCost=FillVab(plr,ccc,0);
- TotalCost+=BuyVabRkt(plr,rk,&qty[0],0);
+ TotalCost+=BuyVabRkt(plr,rk,&qty[0],0);
RectFill(7,87,162,93,3);
- grSetColor(1); if (hasDelay==0 || TotalCost>Data->P[plr].Cash) grSetColor(9); //if cant buy (delay, cost>cash) ->red letters
- PrintAt(13,92,"AUTOPURCHASE (");
- DispNum(0,0,TotalCost);
+ grSetColor(9);
+ PrintAt(13,92,"A");
+ grSetColor(1); if (hasDelay==0 || TotalCost>Data->P[plr].Cash) grSetColor(9); //if can't buy (delay, cost>cash) ->red letters
+ PrintAt(0,0,"UTOPURCHASE (");
+ DispNum(0,0,TotalCost);
PrintAt(0,0," OF ");
- DispMB(0,0,Data->P[plr].Cash);
+ DispMB(0,0,Data->P[plr].Cash);
PrintAt(0,0,")");
WaitForMouseUp();
if (key>0) delay(100);
Index: hardef.c
===================================================================
RCS file: /cvsroot/raceintospace/race/hardef.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- hardef.c 20 Apr 2012 04:30:02 -0000 1.13
+++ hardef.c 19 Aug 2012 22:18:12 -0000 1.14
@@ -99,7 +99,7 @@
{
key = 0;
GetMouse();
- if (mousebuttons > 0 || key > 0) /* Game Play */
+ if (mousebuttons > 0 || key > 0) /* Gameplay */
{
if (((x >= 7 && y >= 164 && x <= 75 && y <= 195
&& mousebuttons > 0) || key == 'U') && place != 0)
@@ -288,7 +288,7 @@
Pt[1][4] += stge;
}
} // end-if
- } //end-if
+ } // end-if
}; // end-if
//EVA suit klugge
@@ -1492,20 +1492,20 @@
{
InBox(55, 21, 116, 29);
grSetColor(1);
- PrintAt(57, 27, "SCORE:");
+ PrintAt(60, 27, "SCORE:");
score = 0;
score = CalcScore(0, Data->Def.Lev1, Data->Def.Lev2);
sprintf(&Digit[0], "%d", score);
- PrintAt(92, 27, &Digit[0]);
+ PrintAt(95, 27, &Digit[0]);
}
if (Option == -1 || Option == 1)
{
InBox(203, 21, 264, 29);
grSetColor(1);
- PrintAt(205, 27, "SCORE:");
+ PrintAt(208, 27, "SCORE:");
score = CalcScore(1, Data->Def.Lev2, Data->Def.Lev1);
sprintf(&Digit[0], "%d", score);
- PrintAt(240, 27, &Digit[0]);
+ PrintAt(243, 27, &Digit[0]);
}
}
Index: version.c
===================================================================
RCS file: /cvsroot/raceintospace/race/version.c,v
retrieving revision 1.265
retrieving revision 1.266
diff -u -d -r1.265 -r1.266
--- version.c 26 Apr 2012 04:36:01 -0000 1.265
+++ version.c 19 Aug 2012 22:18:12 -0000 1.266
@@ -1 +1 @@
-280
+281
|
|
From: Leon B. <pe...@us...> - 2012-04-26 04:36:04
|
Update of /cvsroot/raceintospace/race
In directory vz-cvs-4.sog:/tmp/cvs-serv13541/race
Modified Files:
ChangeLog ast2.c ast3.c version.c
Log Message:
If you withdraw from Adv I or II, you can send 'naut to Advanced again later
Index: ast3.c
===================================================================
RCS file: /cvsroot/raceintospace/race/ast3.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- ast3.c 25 Apr 2012 04:12:29 -0000 1.20
+++ ast3.c 26 Apr 2012 04:36:01 -0000 1.21
@@ -406,7 +406,10 @@
if (Data->P[plr].Pool[M[now2]].Status==AST_ST_TRAIN_ADV_1) Data->P[plr].Cash+=3; // refunds
if (Data->P[plr].Pool[M[now2]].Status==AST_ST_TRAIN_ADV_2) Data->P[plr].Cash+=2; // for early
if (Data->P[plr].Pool[M[now2]].Status==AST_ST_TRAIN_ADV_3) Data->P[plr].Cash+=1; // withdrawal
- Data->P[plr].Pool[M[now2]].TrainingLevel=Data->P[plr].Pool[M[now2]].Status;
+ if (Data->P[plr].Pool[M[now2]].Status==AST_ST_TRAIN_ADV_1 || Data->P[plr].Pool[M[now2]].Status==AST_ST_TRAIN_ADV_2)
+ { Data->P[plr].Pool[M[now2]].TrainingLevel=0; }
+ else
+ { Data->P[plr].Pool[M[now2]].TrainingLevel=Data->P[plr].Pool[M[now2]].Status; }
Data->P[plr].Pool[M[now2]].Status=AST_ST_ACTIVE;
Data->P[plr].Pool[M[now2]].Assign=0;
if (Data->P[plr].Pool[M[now2]].Cap<0) Data->P[plr].Pool[M[now2]].Cap=0;
Index: ChangeLog
===================================================================
RCS file: /cvsroot/raceintospace/race/ChangeLog,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -d -r1.274 -r1.275
--- ChangeLog 25 Apr 2012 04:12:29 -0000 1.274
+++ ChangeLog 26 Apr 2012 04:36:01 -0000 1.275
@@ -1,3 +1,10 @@
+2012-04-25 Leon Baradat <pe...@us...>
+
+ * V280
+
+ * ast2.c, ast3.c: If you withdraw someone from Advanced I or II, you can send them to Advanced
+ training again later
+
2012-04-19 Leon Baradat <pe...@us...>
* V279
Index: version.c
===================================================================
RCS file: /cvsroot/raceintospace/race/version.c,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -d -r1.264 -r1.265
--- version.c 25 Apr 2012 04:12:29 -0000 1.264
+++ version.c 26 Apr 2012 04:36:01 -0000 1.265
@@ -1 +1 @@
-279
+280
Index: ast2.c
===================================================================
RCS file: /cvsroot/raceintospace/race/ast2.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- ast2.c 20 Apr 2012 04:30:02 -0000 1.13
+++ ast2.c 26 Apr 2012 04:36:01 -0000 1.14
@@ -425,7 +425,7 @@
void Clear(void)
{
RectFill(44,31,145,40,3);RectFill(49,112,60,119,3);
- RectFill(123,62,145,77,3);RectFill(128,79,145,92,3);
+ RectFill(123,62,145,77,3);RectFill(125,79,145,85,3);RectFill(128,86,145,93,3);
RectFill(123,95,145,101,3);RectFill(127,113,141,120,3);
RectFill(130,54,155,61,3);
return;
|
|
From: Leon B. <pe...@us...> - 2012-04-25 04:12:31
|
Update of /cvsroot/raceintospace/race
In directory vz-cvs-4.sog:/tmp/cvs-serv5817/race
Modified Files:
ChangeLog ast3.c version.c
Log Message:
Refunds for early withdrawal from Adv Training
Index: ast3.c
===================================================================
RCS file: /cvsroot/raceintospace/race/ast3.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- ast3.c 20 Apr 2012 04:30:02 -0000 1.19
+++ ast3.c 25 Apr 2012 04:12:29 -0000 1.20
@@ -403,6 +403,9 @@
temp=0;if (plr==0) temp=Help("i102"); else temp=Help("i109");
if (temp==1)
{
+ if (Data->P[plr].Pool[M[now2]].Status==AST_ST_TRAIN_ADV_1) Data->P[plr].Cash+=3; // refunds
+ if (Data->P[plr].Pool[M[now2]].Status==AST_ST_TRAIN_ADV_2) Data->P[plr].Cash+=2; // for early
+ if (Data->P[plr].Pool[M[now2]].Status==AST_ST_TRAIN_ADV_3) Data->P[plr].Cash+=1; // withdrawal
Data->P[plr].Pool[M[now2]].TrainingLevel=Data->P[plr].Pool[M[now2]].Status;
Data->P[plr].Pool[M[now2]].Status=AST_ST_ACTIVE;
Data->P[plr].Pool[M[now2]].Assign=0;
Index: version.c
===================================================================
RCS file: /cvsroot/raceintospace/race/version.c,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -d -r1.263 -r1.264
--- version.c 20 Apr 2012 04:30:02 -0000 1.263
+++ version.c 25 Apr 2012 04:12:29 -0000 1.264
@@ -1 +1 @@
-278
+279
Index: ChangeLog
===================================================================
RCS file: /cvsroot/raceintospace/race/ChangeLog,v
retrieving revision 1.273
retrieving revision 1.274
diff -u -d -r1.273 -r1.274
--- ChangeLog 20 Apr 2012 04:30:02 -0000 1.273
+++ ChangeLog 25 Apr 2012 04:12:29 -0000 1.274
@@ -1,5 +1,11 @@
2012-04-19 Leon Baradat <pe...@us...>
+ * V279
+
+ * ast3.c: Refunds for early withdrawal from Adv Training: 3MB for Adv I, 2MB for II, 1MB for III
+
+2012-04-19 Leon Baradat <pe...@us...>
+
* V278
* ast2.c: If 'naut has a skill of 4, don't send to Adv Training for that skill
|
|
From: Leon B. <pe...@us...> - 2012-04-20 04:30:06
|
Update of /cvsroot/raceintospace/race
In directory vz-cvs-4.sog:/tmp/cvs-serv16102/race
Modified Files:
ChangeLog ast2.c ast3.c hardef.c museum.c version.c
Log Message:
Adv Training: if skill=4, don't send; if 3, send to Adv III & charge 2MB
Index: ChangeLog
===================================================================
RCS file: /cvsroot/raceintospace/race/ChangeLog,v
retrieving revision 1.272
retrieving revision 1.273
diff -u -d -r1.272 -r1.273
--- ChangeLog 18 Apr 2012 02:02:54 -0000 1.272
+++ ChangeLog 20 Apr 2012 04:30:02 -0000 1.273
@@ -1,3 +1,16 @@
+2012-04-19 Leon Baradat <pe...@us...>
+
+ * V278
+
+ * ast2.c: If 'naut has a skill of 4, don't send to Adv Training for that skill
+ If 'naut has a skill of 3 and is sent to Adv Training, send directly to Adv
+ Training III and charge 2MB insted of 3MB
+
+ * ast3.c: Properly erase Roman numerals after "ADV TRAINING"
+
+ * museum.c, hardef.c: Better centering of "CONTINUE" in Space History, Prestige Summary,
+ & Hardware Efficiency
+
2012-04-17 Leon Baradat <pe...@us...>
* V277
Index: version.c
===================================================================
RCS file: /cvsroot/raceintospace/race/version.c,v
retrieving revision 1.262
retrieving revision 1.263
diff -u -d -r1.262 -r1.263
--- version.c 18 Apr 2012 02:02:54 -0000 1.262
+++ version.c 20 Apr 2012 04:30:02 -0000 1.263
@@ -1 +1 @@
-277
+278
Index: museum.c
===================================================================
RCS file: /cvsroot/raceintospace/race/museum.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- museum.c 11 Mar 2012 22:09:37 -0000 1.25
+++ museum.c 20 Apr 2012 04:30:02 -0000 1.26
@@ -214,7 +214,7 @@
PrintAt(175,120,"2ND:");
PrintAt(212,120,"SUBS:");
PrintAt(254,120,"FAIL:");
- grSetColor(1);PrintAt(255,13,"CONTINUE");
+ grSetColor(1);PrintAt(257,13,"CONTINUE");
PrintAt(17,39,"FIRST:");
PrintAt(19,81,"DATE:");
grSetColor(11);PrintAt(71,37,"# SPACE FIRSTS:");
@@ -433,7 +433,7 @@
InBox(3,3,31,19); // USA inbox
FlagSm(plr,4,4);
grSetColor(1);
- PrintAt(259,13,"CONTINUE");
+ PrintAt(257,13,"CONTINUE");
ORBox(0,24,319,199,3);
IRBox(4,28,315,170,0);
Index: hardef.c
===================================================================
RCS file: /cvsroot/raceintospace/race/hardef.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- hardef.c 22 Jun 2010 21:11:47 -0000 1.12
+++ hardef.c 20 Apr 2012 04:30:02 -0000 1.13
@@ -71,7 +71,7 @@
DispBig(40, 5, "EFFICIENCY", 1, -1);
FlagSm(plr, 4, 4);
grSetColor(1);
- PrintAt(258, 13, "CONTINUE");
+ PrintAt(257, 13, "CONTINUE");
RectFill(149, 2, 157, 10, 9);
RectFill(149, 2, 156, 9, 8);
grSetColor(9);
Index: ast2.c
===================================================================
RCS file: /cvsroot/raceintospace/race/ast2.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- ast2.c 28 Apr 2011 02:31:26 -0000 1.12
+++ ast2.c 20 Apr 2012 04:30:02 -0000 1.13
@@ -27,6 +27,7 @@
#include <externs.h>
int lenprogname; // Variable to hold and manipulate length of program name
+int skilLev; // Variable for 'naut's skill level (so 4s don't go to Adv Training, and 3s go to Adv III)
void DrawLimbo(char plr)
{
@@ -351,12 +352,28 @@
if (key>0) delay(140);
WaitForMouseUp();key=0;
OutBox(244,95+21*i,313,109+21*i);
+ skilLev=0; // Figure out relevant skill level bfr sending to Adv Training -Leon
+ if (i==0) skilLev=Data->P[plr].Pool[M[now2]].Cap;
+ if (i==1) skilLev=Data->P[plr].Pool[M[now2]].LM;
+ if (i==2) skilLev=Data->P[plr].Pool[M[now2]].EVA;
+ if (i==3) skilLev=Data->P[plr].Pool[M[now2]].Docking;
+ if (i==4) skilLev=Data->P[plr].Pool[M[now2]].Endurance;
+ grSetColor(2);
if (Data->P[plr].Pool[M[now2]].TrainingLevel>6) Help("i120");
+ else if (skilLev > 3) OutBox(244,95+21*i,313,109+21*i); // If they have a 4 in that skill, don't send to Adv Training for it
else if (Data->P[plr].Cash<3) Help("i121");
else {
- Data->P[plr].Pool[M[now2]].Status=AST_ST_TRAIN_ADV_1;
- Data->P[plr].Cash-=3;
- Data->P[plr].Pool[M[now2]].Focus=i+1;
+ if (skilLev>2) // If they have a 3 in that skill, send them directly to Adv III and charge just 2MB
+ {
+ Data->P[plr].Pool[M[now2]].Status=AST_ST_TRAIN_ADV_3;
+ Data->P[plr].Cash-=2;
+ }
+ else
+ {
+ Data->P[plr].Pool[M[now2]].Status=AST_ST_TRAIN_ADV_1;
+ Data->P[plr].Cash-=3;
+ }
+ Data->P[plr].Pool[M[now2]].Focus=i+1;
Data->P[plr].Pool[M[now2]].Assign=0;
Data->P[plr].Pool[M[now2]].Una=0;
Data->P[plr].Pool[M[now2]].Moved=0;
@@ -423,7 +440,7 @@
if (Data->P[plr].Pool[astro].Mood<40 && Data->P[plr].Pool[astro].Mood>=20) col=8;
if (Data->P[plr].Pool[astro].Mood<20) col=0;
if (Data->P[plr].Pool[astro].Mood==0) col=3;
- grSetColor(col); // Print 'naut name in green/yellow/red/black depending on mood -Leon
+ grSetColor(col); // Print name in green/yellow/red/black depending on mood -Leon
if (Data->P[plr].Pool[astro].RDelay>0) grSetColor(0); // Print name in black if 'naut has announced retirement (override mood) -Leon
PrintAt(46,37,Data->P[plr].Pool[astro].Name);
grSetColor(11);
@@ -440,7 +457,7 @@
RectFill(131,86,145,92,3);
RectFill(123,95,145,101,3);
RectFill(130,54,155,61,3);
- grSetColor(col); // Print 'naut mood in green/yellow/red/black depending on mood -Leon
+ grSetColor(col); // Print mood in green/yellow/red/black depending on mood -Leon
DispNum(132,60,Data->P[plr].Pool[astro].Mood);
grSetColor(11);
DispNum(125,68,Data->P[plr].Pool[astro].Cap);
Index: ast3.c
===================================================================
RCS file: /cvsroot/raceintospace/race/ast3.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- ast3.c 31 Mar 2012 04:21:42 -0000 1.18
+++ ast3.c 20 Apr 2012 04:30:02 -0000 1.19
@@ -110,7 +110,7 @@
RectFill(200, 116, 220, 120, 3);
RectFill(202, 93, 220, 97, 3);
RectFill(216, 102, 294, 106, 3);
- RectFill(212, 111, 317, 124, 3);
+ RectFill(212, 107, 317, 124, 3);
RectFill(215, 138, 235, 142, 3);
RectFill(213, 145, 243, 150, 3);
RectFill(221, 153, 241, 158, 3);
@@ -127,7 +127,7 @@
if (Data->P[plr].Pool[astro].Mood<40 && Data->P[plr].Pool[astro].Mood>=20) col=8;
if (Data->P[plr].Pool[astro].Mood<20) col=0;
if (Data->P[plr].Pool[astro].Mood==0) col=3;
- grSetColor(col); // Print 'naut name in green/yellow/red/black depending on mood -Leon
+ grSetColor(col); // Print name in green/yellow/red/black depending on mood -Leon
PrintAt(200, 120, " "); DispNum(200, 120, Data->P[plr].Pool[astro].Mood);
grMoveTo(212, 111);
grSetColor(11);
@@ -205,7 +205,7 @@
2 = Advanced LM
3 = Advanced EVA
4 = Advanced Docking
- 5 = Advanced Duration
+ 5 = Advanced Endurance
*/
void Train(char plr,int level)
|
|
From: Leon B. <pe...@us...> - 2012-04-18 02:02:56
|
Update of /cvsroot/raceintospace/race
In directory vz-cvs-4.sog:/tmp/cvs-serv28279/race
Modified Files:
ChangeLog rdplex.c version.c
Log Message:
Moved AVOID FAIL notif to stay out of the way of the FIX button
Index: rdplex.c
===================================================================
RCS file: /cvsroot/raceintospace/race/rdplex.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- rdplex.c 17 Apr 2012 03:35:36 -0000 1.29
+++ rdplex.c 18 Apr 2012 02:02:54 -0000 1.30
@@ -430,16 +430,12 @@
{ // b is the cost per roll
if (hardware==1)
b=Data->P[player_index].Probe[unit-1].RDCost;
- if (Data->P[player_index].Probe[unit-1].SaveCard>0) PrintAt(170,90,"AVOID");
if (hardware==2)
b=Data->P[player_index].Rocket[unit-1].RDCost;
- if (Data->P[player_index].Rocket[unit-1].SaveCard>0) PrintAt(170,90,"AVOID");
if (hardware==3)
b=Data->P[player_index].Manned[unit-1].RDCost;
- if (Data->P[player_index].Manned[unit-1].SaveCard>0) PrintAt(50,10,"XX");
if (hardware==4)
b=Data->P[player_index].Misc[unit-1].RDCost;
- if (Data->P[player_index].Misc[unit-1].SaveCard>0) PrintAt(170,90,"AVOID");
// Add to the expenditure data
if ( (b*roll <= Data->P[player_index].Cash) && QueryUnit(hardware,unit,player_index)
@@ -631,11 +627,11 @@
}
if (avoidf>0)
{
- RectFill(286,91,316,91,5);RectFill(286,106,316,106,5);
- RectFill(286,92,286,105,5);RectFill(316,92,316,105,5);
+ RectFill(286,71,316,71,5);RectFill(286,86,316,86,5);
+ RectFill(286,72,286,85,5);RectFill(316,72,316,85,5);
grSetColor(11);
- PrintAt(288,97,"AVOID");
- PrintAt(291,104,"FAIL");
+ PrintAt(288,77,"AVOID");
+ PrintAt(291,84,"FAIL");
grSetColor(1);
}
Index: version.c
===================================================================
RCS file: /cvsroot/raceintospace/race/version.c,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -d -r1.261 -r1.262
--- version.c 17 Apr 2012 03:35:36 -0000 1.261
+++ version.c 18 Apr 2012 02:02:54 -0000 1.262
@@ -1 +1 @@
-276
+277
Index: ChangeLog
===================================================================
RCS file: /cvsroot/raceintospace/race/ChangeLog,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -d -r1.271 -r1.272
--- ChangeLog 17 Apr 2012 03:35:36 -0000 1.271
+++ ChangeLog 18 Apr 2012 02:02:54 -0000 1.272
@@ -1,4 +1,10 @@
-2012-04-10 Leon Baradat <pe...@us...>
+2012-04-17 Leon Baradat <pe...@us...>
+
+ * V277
+
+ * rdplex.c: Moved AVOID FAIL notification to stay out of the way of the FIX button
+
+2012-04-16 Leon Baradat <pe...@us...>
* V276
|
|
From: Leon B. <pe...@us...> - 2012-04-17 03:35:39
|
Update of /cvsroot/raceintospace/race
In directory vz-cvs-4.sog:/tmp/cvs-serv1460/race
Modified Files:
ChangeLog rdplex.c version.c
Log Message:
Now indicates strong/weak research, and holding of Failure Avoidance card
Index: rdplex.c
===================================================================
RCS file: /cvsroot/raceintospace/race/rdplex.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- rdplex.c 11 Apr 2012 03:11:52 -0000 1.28
+++ rdplex.c 17 Apr 2012 03:35:36 -0000 1.29
@@ -30,6 +30,7 @@
#include <options.h>
int call,wh;
+int avoidf;
GXHEADER but,mans;
extern char HARD1,UNIT1,BUTLOAD;
@@ -429,12 +430,16 @@
{ // b is the cost per roll
if (hardware==1)
b=Data->P[player_index].Probe[unit-1].RDCost;
+ if (Data->P[player_index].Probe[unit-1].SaveCard>0) PrintAt(170,90,"AVOID");
if (hardware==2)
b=Data->P[player_index].Rocket[unit-1].RDCost;
+ if (Data->P[player_index].Rocket[unit-1].SaveCard>0) PrintAt(170,90,"AVOID");
if (hardware==3)
b=Data->P[player_index].Manned[unit-1].RDCost;
+ if (Data->P[player_index].Manned[unit-1].SaveCard>0) PrintAt(50,10,"XX");
if (hardware==4)
b=Data->P[player_index].Misc[unit-1].RDCost;
+ if (Data->P[player_index].Misc[unit-1].SaveCard>0) PrintAt(170,90,"AVOID");
// Add to the expenditure data
if ( (b*roll <= Data->P[player_index].Cash) && QueryUnit(hardware,unit,player_index)
@@ -616,6 +621,38 @@
PrintAt(170,125,"UNIT WEIGHT:");
PrintAt(170,132,"MAXIMUM PAYLOAD:");
PrintAt(170,146,"MAXIMUM SAFETY:");
+
+ avoidf=0;
+ switch(hw) {
+ case 1: if (Data->P[player_index].Probe[un-1].SaveCard > 0) avoidf=1;break;
+ case 2: if (Data->P[player_index].Rocket[un-1].SaveCard > 0) avoidf=1;break;
+ case 3: if (Data->P[player_index].Manned[un-1].SaveCard > 0) avoidf=1;break;
+ case 4: if (Data->P[player_index].Misc[un-1].SaveCard > 0) avoidf=1;break;
+ }
+ if (avoidf>0)
+ {
+ RectFill(286,91,316,91,5);RectFill(286,106,316,106,5);
+ RectFill(286,92,286,105,5);RectFill(316,92,316,105,5);
+ grSetColor(11);
+ PrintAt(288,97,"AVOID");
+ PrintAt(291,104,"FAIL");
+ grSetColor(1);
+ }
+
+ if (Data->P[player_index].RDMods != 0)
+ {
+ PrintAt(170,153,"RESEARCH ");
+ if (Data->P[player_index].RDMods > 0)
+ { PrintAt(0,0,"STRONG: ");
+ RectFill(264,149,264,153,1); RectFill(262,151,266,151,1); // This is to fake a plus sign, which the game apparently can't draw -Leon
+ }
+ else
+ {
+ PrintAt(0,0,"WEAK: ");
+ }
+ DispNum(0,0,Data->P[player_index].RDMods);
+ PrintAt(0,0,"%/TEAM");
+ }
grSetColor(20);PrintAt(170,139,"MAXIMUM R&D:");
char EqDmg=0;
Index: version.c
===================================================================
RCS file: /cvsroot/raceintospace/race/version.c,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -d -r1.260 -r1.261
--- version.c 11 Apr 2012 03:11:52 -0000 1.260
+++ version.c 17 Apr 2012 03:35:36 -0000 1.261
@@ -1 +1 @@
-275
+276
Index: ChangeLog
===================================================================
RCS file: /cvsroot/raceintospace/race/ChangeLog,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -d -r1.270 -r1.271
--- ChangeLog 11 Apr 2012 03:11:52 -0000 1.270
+++ ChangeLog 17 Apr 2012 03:35:36 -0000 1.271
@@ -1,5 +1,12 @@
2012-04-10 Leon Baradat <pe...@us...>
+ * V276
+
+ * rdplex.c: R&D and Purchasing screens now indicate when research is stronger or weaker,
+ and when a component has an Avoid Failure card
+
+2012-04-10 Leon Baradat <pe...@us...>
+
* V275
* rdplex.c: Technology Transfer will now give partial credit if relevant hardware is below 75% Safety
|
|
From: Leon B. <pe...@us...> - 2012-04-11 03:11:55
|
Update of /cvsroot/raceintospace/race
In directory vz-cvs-4.sog:/tmp/cvs-serv3521/race
Modified Files:
ChangeLog rdplex.c version.c
Log Message:
Technology Transfer will now give partial credit if relevant hardware is below 75% Safety
Index: rdplex.c
===================================================================
RCS file: /cvsroot/raceintospace/race/rdplex.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- rdplex.c 22 Jun 2011 12:07:38 -0000 1.27
+++ rdplex.c 11 Apr 2012 03:11:52 -0000 1.28
@@ -26,7 +26,7 @@
*/
#include <Buzz_inc.h>
-#include <externs.h>
+#include <externs.h>
#include <options.h>
int call,wh;
@@ -167,10 +167,10 @@
grSetColor(3);grMoveTo(296,174);grLineTo(314,174);
- gxVirtualDisplay(&but,0,0,8,30,74,59,0); // Unmanned
- gxVirtualDisplay(&but,68,0,84,30,155,59,0); // Rocket
- gxVirtualDisplay(&but,141,0,165,30,236,59,0);// Manned
- gxVirtualDisplay(&but,214,0,246,30,312,59,0);// Misc
+ gxVirtualDisplay(&but,0,0,8,30,74,59,0); // Unmanned
+ gxVirtualDisplay(&but,68,0,84,30,155,59,0); // Rocket
+ gxVirtualDisplay(&but,141,0,165,30,236,59,0); // Manned
+ gxVirtualDisplay(&but,214,0,246,30,312,59,0); // Misc
grSetColor(1);
DispBig(50,5,"RESEARCH",0,-1);
@@ -199,30 +199,30 @@
switch(old) {
case 1:OutBox(7,29,75,60);
- gxVirtualDisplay(&but,0,0,8,30,74,59,0); // Unmanned
+ gxVirtualDisplay(&but,0,0,8,30,74,59,0); // Unmanned
break;
case 2:OutBox(83,29,156,60);
- gxVirtualDisplay(&but,68,0,84,30,155,59,0); // Rocket
+ gxVirtualDisplay(&but,68,0,84,30,155,59,0); // Rocket
break;
case 3:OutBox(164,29,237,60);
- gxVirtualDisplay(&but,141,0,165,30,236,59,0);// Manned
+ gxVirtualDisplay(&but,141,0,165,30,236,59,0); // Manned
break;
case 4:OutBox(245,29,313,60);
- gxVirtualDisplay(&but,214,0,246,30,312,59,0);// Misc
+ gxVirtualDisplay(&but,214,0,246,30,312,59,0); // Misc
break;
}
switch(nw) {
case 1:InBox(7,29,75,60);
- gxVirtualDisplay(&but,0,31,8,30,74,59,0); // Unmanned
+ gxVirtualDisplay(&but,0,31,8,30,74,59,0); // Unmanned
break;
case 2:InBox(83,29,156,60);
- gxVirtualDisplay(&but,68,31,84,30,155,59,0); // Rocket
+ gxVirtualDisplay(&but,68,31,84,30,155,59,0); // Rocket
break;
case 3:InBox(164,29,237,60);
- gxVirtualDisplay(&but,141,31,165,30,236,59,0);// Manned
+ gxVirtualDisplay(&but,141,31,165,30,236,59,0); // Manned
break;
case 4:InBox(245,29,313,60);
- gxVirtualDisplay(&but,214,31,246,30,312,59,0);// Misc
+ gxVirtualDisplay(&but,214,31,246,30,312,59,0); // Misc
break;
}
@@ -556,7 +556,7 @@
/**
* Roll dice and improve R&D value of a given hardware.
*
- * HACK: need to store number of dices rolled in return value
+ * HACK: need to store number of dice rolled in return value
*
* @param[in] hardwareTypeIndex
* @param[in] hardwareIndex
@@ -608,7 +608,7 @@
grSetColor(1);
- RectFill(162,69,318,154,3);RectFill(200,9,238,21,3);
+ RectFill(162,69,318,146,3);RectFill(200,9,238,21,3);
grSetColor(1);
PrintAt(170,97,"INITIAL COST:");
PrintAt(170,104,"UNIT COST:");
@@ -676,13 +676,13 @@
if (hw!=2) DispNum(240,125,PL->UnitWeight);
else PrintAt(240,125,"N/A");
- grSetColor(20);
- if (PL->MaxRD!=0) {
- DispNum(242,139,PL->MaxRD);DispChr('%');
- if (options.want_debug) {
- PrintAt(0,0," / "); DispNum(0,0,PL->MSF); DispChr('%'); //Used to test if MSF was holding the right value
- }
- }
+ grSetColor(20);
+ if (PL->MaxRD!=0) {
+ DispNum(242,139,PL->MaxRD);DispChr('%');
+ if (options.want_debug) {
+ PrintAt(0,0," / "); DispNum(0,0,PL->MSF); DispChr('%'); //Used to test if MSF was holding the right value
+ }
+ }
else PrintAt(242,139, "--");
grSetColor(11);DispNum(254,146,PL->MaxSafety);DispChr('%');
@@ -747,7 +747,7 @@
FlagSm(player_index,4,4);
IOBox(264,162,316,176);
- grSetColor(11);PrintAt(280,171,"UNDO");
+ grSetColor(11);PrintAt(279,171,"UNDO");
OutBox(21,90,136,176);InBox(26,94,131,172);
@@ -858,7 +858,7 @@
ShowUnit(hardware,unit,player_index);
}
else
- if (((x>=164 && x<=237 && mousebuttons>0) || key=='C') && hardware != 3) /* MODULES-CAPSULES */
+ if (((x>=164 && x<=237 && mousebuttons>0) || key=='C') && hardware != 3) /* CAPSULES */
{
BButs(hardware,3);
hardware=3;unit=1;
@@ -1037,76 +1037,157 @@
Data->P[player_index].Spend[0][category - 1] += Unit_Cost;
}
+ float tt=0; // initialize variable for tech transfer
+
/* compute technology transfer for Probe category */
if (new_program && category == 1)
{
- n1 = Data->P[player_index].Probe[0].Safety;
- n2 = Data->P[player_index].Probe[1].Safety;
- n3 = Data->P[player_index].Probe[2].Safety;
+ n1 = Data->P[player_index].Probe[0].Safety; /* Satellite */
+ n2 = Data->P[player_index].Probe[1].Safety; /* Flyby Probe */
+ n3 = Data->P[player_index].Probe[2].Safety; /* Landing Probe */
switch (unit - 1)
{
- case 0:
- if (n2 >= 75)
- Data->P[player_index].Probe[0].Safety = 50;
- if (n3 >= 75)
- Data->P[player_index].Probe[0].Safety = 60;
+ case 0: // Explorer/Sputnik
+ if (n2 > 40)
+ tt = (n2-40)/3.5;
+ //old code: Data->P[player_index].Probe[0].Safety = 50;
+ if (n3 > 40 && n3 > n1)
+ tt = (n3-40)/3.5;
+ //old code: Data->P[player_index].Probe[0].Safety = 60;
+ if (tt > 10) tt=10;
+ Data->P[player_index].Probe[0].Safety = 40 + tt;
break;
- case 1:
- if (n1 >= 75)
- Data->P[player_index].Probe[1].Safety = 45;
- if (n3 >= 75)
- Data->P[player_index].Probe[1].Safety = 50;
+ case 1: // Ranger/Cosmos
+ if (n1 > 40)
+ tt = (n1-40)/7;
+ if (tt>5) tt=5;
+ //old code: Data->P[player_index].Probe[1].Safety = 45;
+ if (n3 > 40 && n3 > n1)
+ tt = (n3-40)/3.5;
+ if (tt>10) tt=10;
+ //old code: Data->P[player_index].Probe[1].Safety = 50;
+ Data->P[player_index].Probe[1].Safety = 40 + tt;
break;
- case 2:
- if (n1 >= 75)
- Data->P[player_index].Probe[2].Safety = 45;
- if (n2 >= 75)
- Data->P[player_index].Probe[2].Safety = 50;
+ case 2: // Surveyor/Luna
+ if (n1 > 40)
+ tt = (n1-40)/7;
+ if (tt>5) tt=5;
+ //old code: Data->P[player_index].Probe[2].Safety = 45;
+ if (n2 > 40 && n2 > n1)
+ tt = (n2-40)/3.5;
+ if (tt>10) tt=10;
+ //old code: Data->P[player_index].Probe[2].Safety = 50;
+ Data->P[player_index].Probe[2].Safety = 40 + tt;
break;
}
+
}
/* compute technology transfer for Rocket category */
if (new_program && category == 2)
{
- n1 = Data->P[player_index].Rocket[0].Safety; /* One - A */
- n2 = Data->P[player_index].Rocket[1].Safety; /* Two - B */
- n3 = Data->P[player_index].Rocket[2].Safety; /* Three - C */
+ n1 = Data->P[player_index].Rocket[0].Safety; /* One-stage - A */
+ n2 = Data->P[player_index].Rocket[1].Safety; /* Two-stage - B */
+ n3 = Data->P[player_index].Rocket[2].Safety; /* Three-stage - C */
n4 = Data->P[player_index].Rocket[3].Safety; /* Mega - G */
n5 = Data->P[player_index].Rocket[4].Safety; /* Booster - D */
switch (unit - 1)
{
- case 0:
- if (n2 >= 75 || n3 >= 75 || n4 >= 75 || n5 >= 75)
- Data->P[player_index].Rocket[0].Safety = 35;
+ case 0: // Atlas/R-7
+ if (n2 > 10) // Tech from Titan/Proton
+ tt = (n2-10)/2.6;
+ if (tt>25) tt=25;
+ Data->P[player_index].Rocket[0].Safety = 10 + tt;
+ if (n3 > 5) // Tech from Saturn/N1
+ tt = (n3-5)/2.8;
+ if (tt>25) tt=25;
+ Data->P[player_index].Rocket[0].Safety = 10 + tt;
+ if (n4 > 5) // Tech from Nova/UR-700
+ tt = (n4-5)/2.8;
+ if (tt>25) tt=25;
+ if (n5 > 10) // Tech from Boosters
+ tt = (n5-10)/2.6;
+ if (tt>25) tt=25;
+ Data->P[player_index].Rocket[0].Safety = 10 + tt;
+ //old code: if (n2 >= 75 || n3 >= 75 || n4 >= 75 || n5 >= 75)
+ //old code: Data->P[player_index].Rocket[0].Safety = 35;
break;
- case 1:
- if (n1 >= 75 || n5 >= 75)
- Data->P[player_index].Rocket[1].Safety = 25;
- if (n3 >= 75 || n4 >= 75)
- Data->P[player_index].Rocket[1].Safety = 40;
- if ((n1 >= 75 || n5 >= 75) && (n3 >= 75 || n4 >= 75))
- Data->P[player_index].Rocket[1].Safety = 65;
+ case 1: // Titan/Proton
+ if (n1 > 10)
+ tt = (n1-10)/4.3;
+ if (tt>15) tt=15;
+ if (n5 > 10 && n5 > n1)
+ tt = (n5-10)/4.3;
+ if (tt>15) tt=15;
+ //old code: if (n1 >= 75 || n5 >= 75)
+ //old code: Data->P[player_index].Rocket[1].Safety = 25;
+ if (n3 > 5)
+ if ((n3-5)/4.6 > tt) tt = (n3-5)/2.3;
+ if (tt>30) tt=30;
+ if (n4 > 5)
+ if ((n4-5)/4.6 > tt) tt = (n4-5)/2.3;
+ if (tt>30) tt=30;
+ //old code: if (n3 >= 75 || n4 >= 75)
+ //old code: Data->P[player_index].Rocket[1].Safety = 40;
+ Data->P[player_index].Rocket[1].Safety = 10 + tt;
+ if ((n1 >= 75 || n5 >= 75) && (n3 >= 75 || n4 >= 75)) // Tech from multiple programs
+ //old code: Data->P[player_index].Rocket[1].Safety = 65;
break;
- case 2:
- if (n1 >= 75 || n5 >= 75)
- Data->P[player_index].Rocket[2].Safety = 15;
- if (n2 >= 75 || n4 >= 75)
- Data->P[player_index].Rocket[2].Safety = 35;
- if ((n1 >= 75 || n5 >= 75) && (n2 >= 75 || n4 >= 75))
+ case 2: // Saturn/N1
+ if (n1 > 10)
+ tt = (n1-10)/6.5;
+ if (tt>10) tt=10;
+ if (n5 >10 && n5 > n1)
+ tt = (n5-10)/6.5;
+ if (tt>10) tt=10;
+ //old code: if (n1 >= 75 || n5 >= 75)
+ //old code: Data->P[player_index].Rocket[2].Safety = 15;
+ if (n2 > 10)
+ tt = (n2-10)/2.16;
+ if (tt>30) tt=30;
+ if (n4 > 5)
+ if ((n4-5)/3.5>tt) tt = (n4-5)/2.3;
+ if (tt>30) tt=30;
+ //old code: if (n2 >= 75 || n4 >= 75)
+ //old code: Data->P[player_index].Rocket[2].Safety = 35;
+ Data->P[player_index].Rocket[2].Safety = 5 + tt;
+ if ((n1 >= 75 || n5 >= 75) && (n2 >= 75 || n4 >= 75)) // Tech from multiple programs
Data->P[player_index].Rocket[2].Safety = 60;
break;
- case 3:
- if (n1 >= 75 || n5 >= 75)
- Data->P[player_index].Rocket[3].Safety = 10;
- if (n2 >= 75 || n3 >= 75)
- Data->P[player_index].Rocket[3].Safety = 25;
- if ((n1 >= 75 || n5 >= 75) && (n2 >= 75 || n3 >= 75))
+ case 3: // Nova/UR-700
+ if (n1 > 10)
+ tt = (n1-10)/13;
+ if (tt>5) tt=5;
+ if (n5 > 10 && n5 > n1)
+ tt = (n5-10)/13;
+ if (tt>5) tt=5;
+ //old code: if (n1 >= 75 || n5 >= 75)
+ //old code: Data->P[player_index].Rocket[3].Safety = 10;
+ if (n2 > 10)
+ tt = (n2-5)/3.25;
+ if (tt>5) tt=20;
+ if (n3 > 10)
+ if ((n3-5)/3.5 > tt) tt = (n3-5)/3.5;
+ if (tt>5) tt=20;
+ Data->P[player_index].Rocket[3].Safety = 5 + tt;
+ //old code: if (n2 >= 75 || n3 >= 75)
+ //old code: Data->P[player_index].Rocket[3].Safety = 25;
+ if ((n1 >= 75 || n5 >= 75) && (n2 >= 75 || n3 >= 75)) // Tech from multiple programs
Data->P[player_index].Rocket[3].Safety = 35;
break;
- case 4:
- if (n1 >= 75 || n2 >= 75 || n3 >= 75 || n4 >= 75)
- Data->P[player_index].Rocket[4].Safety = 30;
+ case 4: // Boosters
+ if (n1 > 10) // Tech from Atlas/R-7
+ tt = (n1-10)/3.25;
+ if (n2 > 10) // Tech from Titan/Proton
+ if ((n2-10)/3.25>tt) tt = (n2-10)/3.25;
+ if (n3 > 5) // Tech from Saturn/N1
+ if ((n3-5)/3.5>tt) tt = (n3-5)/3.5;
+ if (n4 > 5) // Tech from Nova/UR-700
+ if ((n4-5)/3.5>tt) tt = (n4-5)/3.5;
+ if (tt>20) tt=20;
+ Data->P[player_index].Rocket[4].Safety = 10 + tt;
+ // old code: if (n1 >= 75 || n2 >= 75 || n3 >= 75 || n4 >= 75)
+ //old code: Data->P[player_index].Rocket[4].Safety = 30;
break;
};
};
@@ -1114,82 +1195,146 @@
/* compute technology transfer for Manned category */
if (new_program && category == 3)
{
- n1 = Data->P[player_index].Manned[0].Safety; /* One - a */
- n2 = Data->P[player_index].Manned[1].Safety; /* Two - b */
- n3 = Data->P[player_index].Manned[2].Safety; /* Three - c */
+ n1 = Data->P[player_index].Manned[0].Safety; /* One-person - a */
+ n2 = Data->P[player_index].Manned[1].Safety; /* Two-person - b */
+ n3 = Data->P[player_index].Manned[2].Safety; /* Three-person - c */
n4 = Data->P[player_index].Manned[3].Safety; /* Minishuttle - f */
- n5 = Data->P[player_index].Manned[4].Safety; /* cap/mod - h */
- n6 = Data->P[player_index].Manned[5].Safety; /* 2 mod - d */
- n7 = Data->P[player_index].Manned[6].Safety; /* 1 mod - e */
+ n5 = Data->P[player_index].Manned[4].Safety; /* Dir Ascent - h */
+ n6 = Data->P[player_index].Manned[5].Safety; /* 2-seat LM - d */
+ n7 = Data->P[player_index].Manned[6].Safety; /* 1-seat LM - e */
switch (unit - 1)
{
- case 0:
- if (n2 >= 75 || n3 >= 75 || n5 >= 75)
- Data->P[player_index].Manned[0].Safety = 40;
+ case 0: // Mercury/Vostok
+ if (n2 > 5) // tech from Gemini/Voskhod
+ tt = (n2-5)/2;
+ if (n3 > 5) // tech from Apollo/Soyuz
+ if ((n3-5)/2 > tt) tt = (n3-5)/2;
+ if (n5 > 5) // tech from Jupiter/LK-700
+ if ((n5-5)/2 > tt) tt = (n5-5)/2;
+ if (tt>35) tt=35;
+ Data->P[player_index].Manned[0].Safety = 5 + tt;
+ //old code: if (n2 >= 75 || n3 >= 75 || n5 >= 75)
+ //old code: Data->P[player_index].Manned[0].Safety = 40;
break;
- case 1:
- if (n1 >= 75)
- Data->P[player_index].Manned[1].Safety = 20;
- if (n3 >= 75 || n5 >= 75)
- Data->P[player_index].Manned[1].Safety = 40;
+ case 1: // Gemini/Voskhod
+ if (n1 > 1) // tech from Mercury/Vostok
+ tt = (n1-5)/4.66;
+ if (tt>15) tt=15;
+ //old code: if (n1 >= 75)
+ //old code: Data->P[player_index].Manned[1].Safety = 20;
+ if (n3 > 5) // tech from Apollo/Soyuz
+ if ((n3-5)/2 > tt) tt = (n3-5)/2;
+ if (n5 > 5) // tech from Jupiter/LK-700
+ if ((n5-5)/2.3 > tt) tt = (n5-5)/2.3;
+ if (tt>35) tt=35;
+ Data->P[player_index].Manned[1].Safety = 5 + tt;
+ //old code: if (n3 >= 75 || n5 >= 75)
+ //old code: Data->P[player_index].Manned[1].Safety = 40;
break;
- case 2:
- if (n1 >= 75 || n5 >= 75)
- Data->P[player_index].Manned[2].Safety = 20;
- if (n2 >= 75 || n4 >= 75)
- Data->P[player_index].Manned[2].Safety = 30;
- if ((n1 >= 75 || n5 >= 75) && (n2 >= 75 || n4 >= 75))
+ case 2: // Apollo/Soyuz
+ if (n1 > 5) // tech from Mercury/Vostok
+ tt = (n1-5)/4.66;
+ if (tt>15) tt=15;
+ if (n5 > 5) // tech from Jupiter/LK-700
+ if ((n5-5)/2.3 > tt) tt = (n5-5)/2.3;
+ if (tt>35) tt=35;
+ //old code: if (n1 >= 75 || n5 >= 75)
+ //old code: Data->P[player_index].Manned[2].Safety = 20;
+ if (n2 > 5) // tech from Gemini/Voskhod
+ if ((n2-5)/2.3 > tt) tt = (n2-5)/2.3;
+ if (tt>35) tt=35;
+ Data->P[player_index].Manned[2].Safety = 5 + tt;
+ //old code: if (n2 >= 75 || n4 >= 75)
+ //old code: Data->P[player_index].Manned[2].Safety = 30;
+ if ((n1 >= 75 || n5 >= 75) && (n2 >= 75 || n4 >= 75)) // Tech from multiple programs
Data->P[player_index].Manned[2].Safety = 40;
break;
- case 3:
+ case 3: // Minishuttles
break;
- case 4:
- if (n1 >= 75)
- Data->P[player_index].Manned[4].Safety = 10;
- if (n2 >= 75)
- Data->P[player_index].Manned[4].Safety = 15;
- if (n3 >= 75)
- Data->P[player_index].Manned[4].Safety = 25;
- if ((n1 >= 75 || n2 >= 75 || n3 >= 75) && (n6 >= 75
- || n7 >= 75))
+ case 4: // Jupiter/LK-700
+ if (n1 > 5) // tech from Mercury/Vostok
+ tt = (n1-5)/14;
+ if (tt>5) tt=5;
+ //old code: if (n1 >= 75)
+ //old code: Data->P[player_index].Manned[4].Safety = 10;
+ if (n2 > 5) // tech from Gemini/Voskhod
+ if ((n2-5)/7 > tt) tt = (n2-5)/7;
+ if (tt>10) tt=10;
+ //old code: if (n2 >= 75)
+ //old code: Data->P[player_index].Manned[4].Safety = 15;
+ if (n3 > 5) // tech from Apollo/Soyuz
+ if ((n3-5)/3.5 > tt) tt = (n3-5)/3.5;
+ if (tt>20) tt=20;
+ Data->P[player_index].Manned[4].Safety = 5 + tt;
+ //old code: if (n3 >= 75)
+ //old code: Data->P[player_index].Manned[4].Safety = 25;
+ if ((n1 >= 75 || n2 >= 75 || n3 >= 75) && (n6 >= 75 || n7 >= 75)) // Tech from multiple programs
Data->P[player_index].Manned[4].Safety = 35;
break;
- case 5:
- if (n7 >= 75)
- Data->P[player_index].Manned[5].Safety = 30;
- if (n5 >= 75)
- Data->P[player_index].Manned[5].Safety = 40;
+ case 5: // Eagle/LKM
+ if (n7 > 10) // tech from Cricket/LK
+ tt = (n7-10)/3.25;
+ if (tt>20) tt=20;
+ //old code: if (n7 >= 75)
+ //old code: Data->P[player_index].Manned[5].Safety = 30;
+ if (n5 > 5) // tech from Jupiter/LK-700
+ if ((n5-5)/2.3 > tt) tt = (n5-5)/2.3;
+ if (tt>30) tt=30;
+ Data->P[player_index].Manned[5].Safety = 10 + tt;
+ //old code: if (n5 >= 75)
+ //old code: Data->P[player_index].Manned[5].Safety = 40;
break;
- case 6:
- if (n6 >= 75)
- Data->P[player_index].Manned[6].Safety = 30;
- if (n5 >= 75)
- Data->P[player_index].Manned[6].Safety = 40;
+ case 6: // Cricket/LK
+ if (n6 > 10) // tech from Eagle/LKM
+ tt = (n6-10)/3.25;
+ if (tt>30) tt=30;
+ //old code: if (n6 >= 75)
+ //old code: Data->P[player_index].Manned[6].Safety = 30;
+ if (n5 > 5) // tech from Jupiter/LK-700
+ if ((n5-5)/2.3 > tt) tt = (n5-5)/2.3;
+ if (tt>30) tt=30;
+ Data->P[player_index].Manned[6].Safety = 10 + tt;
+ //old code: if (n5 >= 75)
+ //old code: Data->P[player_index].Manned[6].Safety = 40;
break;
}
}
- /* compute technology transfer for Misc category */
+ /* compute technology transfer for Misc category */
if (new_program && category == 4)
{
- n1 = Data->P[player_index].Rocket[0].Safety; /* One - A */
- n2 = Data->P[player_index].Rocket[1].Safety; /* Two - B */
- n3 = Data->P[player_index].Rocket[2].Safety; /* Three - C */
+ n1 = Data->P[player_index].Rocket[0].Safety; /* One-stage - A */
+ n2 = Data->P[player_index].Rocket[1].Safety; /* Two-stage - B */
+ n3 = Data->P[player_index].Rocket[2].Safety; /* Three-stage - C */
n4 = Data->P[player_index].Rocket[3].Safety; /* Mega - G */
n5 = Data->P[player_index].Rocket[4].Safety; /* Booster - D */
switch (unit - 1)
{
- case 0:
- if (n2 >= 75)
- Data->P[player_index].Misc[0].Safety = 40;
+ case 0: // Kicker-A
+ if (n2 > 10) // tech from Titan/Proton
+ tt = (n2-10)/2.16;
+ if (tt>30) tt=30;
+ Data->P[player_index].Misc[0].Safety = 10 + tt;
+ //old code: if (n2 >= 75)
+ //old code: Data->P[player_index].Misc[0].Safety = 40;
break;
- case 1:
- if (n1 >= 75)
- Data->P[player_index].Misc[1].Safety = 35;
+ case 1: // Kicker-B
+ if (n1 > 10) // tech from Atlas/R-7
+ tt = (n1-10)/2.6;
+ if (tt>25) tt=25;
+ Data->P[player_index].Misc[1].Safety = 10 + tt;
+ //old code: if (n1 >= 75)
+ //old code: Data->P[player_index].Misc[1].Safety = 35;
break;
- case 2:
- if (n1 >= 75 || n2 >= 75)
- Data->P[player_index].Misc[2].Safety = 25;
+ case 2: // Kicker-C
+ if (n1 > 10) // tech from R-7
+ tt = (n1-10)/3.25;
+ if (n2 > 10) // tech from Proton
+ if ((n2-10)/3.25 > tt) tt = (n2-10)/3.25;
+ if (tt>20) tt=20;
+ Data->P[player_index].Misc[2].Safety = 5 + tt;
+ //old code: if (n1 >= 75 || n2 >= 75)
+ //old code: Data->P[player_index].Misc[2].Safety = 25;
break;
default:
break;
Index: version.c
===================================================================
RCS file: /cvsroot/raceintospace/race/version.c,v
retrieving revision 1.259
retrieving revision 1.260
diff -u -d -r1.259 -r1.260
--- version.c 31 Mar 2012 04:21:42 -0000 1.259
+++ version.c 11 Apr 2012 03:11:52 -0000 1.260
@@ -1 +1 @@
-274
+275
Index: ChangeLog
===================================================================
RCS file: /cvsroot/raceintospace/race/ChangeLog,v
retrieving revision 1.269
retrieving revision 1.270
diff -u -d -r1.269 -r1.270
--- ChangeLog 31 Mar 2012 04:21:42 -0000 1.269
+++ ChangeLog 11 Apr 2012 03:11:52 -0000 1.270
@@ -1,3 +1,9 @@
+2012-04-10 Leon Baradat <pe...@us...>
+
+ * V275
+
+ * rdplex.c: Technology Transfer will now give partial credit if relevant hardware is below 75% Safety
+
2012-03-30 Leon Baradat <pe...@us...>
* V274
|
|
From: Leon B. <pe...@us...> - 2012-03-31 04:21:45
|
Update of /cvsroot/raceintospace/race In directory vz-cvs-4.sog:/tmp/cvs-serv26045/race Modified Files: ChangeLog ast3.c version.c Log Message: Basic and Advanced Training now show 'naut morale Index: ast3.c =================================================================== RCS file: /cvsroot/raceintospace/race/ast3.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- ast3.c 18 Dec 2010 11:57:21 -0000 1.17 +++ ast3.c 31 Mar 2012 04:21:42 -0000 1.18 @@ -85,7 +85,9 @@ /* Data->P[plr].AstroLevel 201,41 */ grSetColor(7); - PrintAt(169,115,"STATUS:"); + PrintAt(169,111,"STATUS:"); + PrintAt(169,120,"MOOD:"); + grSetColor(9);PrintAt(169,133,"SKILL:"); grSetColor(7); PrintAt(192,142,"CAP:"); PrintAt(192,150,"L.M.:"); @@ -105,6 +107,7 @@ char Fritz[20]; RectFill(200, 83, 291, 88, 3); + RectFill(200, 116, 220, 120, 3); RectFill(202, 93, 220, 97, 3); RectFill(216, 102, 294, 106, 3); RectFill(212, 111, 317, 124, 3); @@ -118,7 +121,15 @@ return; grSetColor(1); PrintAt(200, 88, &Data->P[plr].Pool[astro].Name[0]); - grMoveTo(212, 115); + int col; + if (Data->P[plr].Pool[astro].Mood>=65) col=16; + if (Data->P[plr].Pool[astro].Mood<65 && Data->P[plr].Pool[astro].Mood>=40) col=11; + if (Data->P[plr].Pool[astro].Mood<40 && Data->P[plr].Pool[astro].Mood>=20) col=8; + if (Data->P[plr].Pool[astro].Mood<20) col=0; + if (Data->P[plr].Pool[astro].Mood==0) col=3; + grSetColor(col); // Print 'naut name in green/yellow/red/black depending on mood -Leon + PrintAt(200, 120, " "); DispNum(200, 120, Data->P[plr].Pool[astro].Mood); + grMoveTo(212, 111); grSetColor(11); memset(Fritz, 0x00, sizeof(Fritz)); if (Data->P[plr].Pool[astro].Status >= AST_ST_TRAIN_BASIC_1 Index: version.c =================================================================== RCS file: /cvsroot/raceintospace/race/version.c,v retrieving revision 1.258 retrieving revision 1.259 diff -u -d -r1.258 -r1.259 --- version.c 11 Mar 2012 22:09:37 -0000 1.258 +++ version.c 31 Mar 2012 04:21:42 -0000 1.259 @@ -1 +1 @@ -273 +274 Index: ChangeLog =================================================================== RCS file: /cvsroot/raceintospace/race/ChangeLog,v retrieving revision 1.268 retrieving revision 1.269 diff -u -d -r1.268 -r1.269 --- ChangeLog 11 Mar 2012 22:09:37 -0000 1.268 +++ ChangeLog 31 Mar 2012 04:21:42 -0000 1.269 @@ -1,3 +1,9 @@ +2012-03-30 Leon Baradat <pe...@us...> + + * V274 + + * ast3.c: Basic and Advanced Training now show 'naut morale + 2012-03-11 Leon Baradat <pe...@us...> * V273 |
|
From: Leon B. <pe...@us...> - 2012-03-11 22:09:39
|
Update of /cvsroot/raceintospace/race
In directory vz-cvs-4.sog:/tmp/cvs-serv8120/race
Modified Files:
ChangeLog museum.c version.c
Log Message:
Touchup of Astronaut History screen
Index: version.c
===================================================================
RCS file: /cvsroot/raceintospace/race/version.c,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -d -r1.257 -r1.258
--- version.c 4 Mar 2012 22:54:57 -0000 1.257
+++ version.c 11 Mar 2012 22:09:37 -0000 1.258
@@ -1 +1 @@
-272
+273
Index: museum.c
===================================================================
RCS file: /cvsroot/raceintospace/race/museum.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- museum.c 4 Mar 2012 22:54:57 -0000 1.24
+++ museum.c 11 Mar 2012 22:09:37 -0000 1.25
@@ -861,20 +861,21 @@
if ((plr==0 && abuf[*where].Missions>=4) || abuf[*where].Hero==1) Display_ARROW(4,289,105);
else if ((plr==1 && abuf[*where].Missions>=4) || abuf[*where].Hero==1) Display_ARROW(5,290,105);
if (abuf[*where].Missions>0) Display_ARROW(6,245,83);
- DispNum(213,78,abuf[*where].Missions);
- DispNum(216,89,abuf[*where].Prestige);
+ DispNum(214,78,abuf[*where].Missions);
+ DispNum(217,89,abuf[*where].Prestige);
DispNum(250,149,abuf[*where].Days);
- DispNum(252,107,abuf[*where].Cap);
- DispNum(225,115,abuf[*where].LM);
- DispNum(202,123,abuf[*where].EVA);
- DispNum(218,131,abuf[*where].Docking);
- DispNum(232,139,abuf[*where].Endurance);
+ PrintAt(258,149," DAYS");
+ DispNum(253,107,abuf[*where].Cap);
+ DispNum(227,115,abuf[*where].LM);
+ DispNum(204,123,abuf[*where].EVA);
+ DispNum(220,131,abuf[*where].Docking);
+ DispNum(234,139,abuf[*where].Endurance);
DispNum(173,68,abuf[*where].Active/2);
- PrintAt(0,0," YEAR");
+ PrintAt(0,0," YEAR");
if (abuf[*where].Active/2!=1) PrintAt(0,0,"S");
memset(Ast_Name,0x00,sizeof Ast_Name);
strncpy(Ast_Name,abuf[*where].Name,10);
- if (abuf[*where].Sex==1) grSetColor(5);
+ if (abuf[*where].Sex==1) grSetColor(5); // Show females in blue
PrintAt(165,39,Ast_Name); // Displays name of astronaut/cosmonaut
grSetColor(11);
strcat(temp,(char *)Nums[abuf[*where].Group]);
Index: ChangeLog
===================================================================
RCS file: /cvsroot/raceintospace/race/ChangeLog,v
retrieving revision 1.267
retrieving revision 1.268
diff -u -d -r1.267 -r1.268
--- ChangeLog 4 Mar 2012 22:54:57 -0000 1.267
+++ ChangeLog 11 Mar 2012 22:09:37 -0000 1.268
@@ -1,3 +1,9 @@
+2012-03-11 Leon Baradat <pe...@us...>
+
+ * V273
+
+ * museum.c: Touchup of Astronaut History screen
+
2012-03-04 Leon Baradat <pe...@us...>
* V272
|
|
From: Leon B. <pe...@us...> - 2012-03-04 22:55:00
|
Update of /cvsroot/raceintospace/race
In directory vz-cvs-4.sog:/tmp/cvs-serv32371/race
Modified Files:
ChangeLog crew.c future.c museum.c options.c start.c version.c
Log Message:
Adv Train +1 skill after 2 turns; crew skills highlight when assigning crews to missions
Index: ChangeLog
===================================================================
RCS file: /cvsroot/raceintospace/race/ChangeLog,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -d -r1.266 -r1.267
--- ChangeLog 30 Sep 2011 04:08:28 -0000 1.266
+++ ChangeLog 4 Mar 2012 22:54:57 -0000 1.267
@@ -1,3 +1,17 @@
+2012-03-04 Leon Baradat <pe...@us...>
+
+ * V272
+
+ * start.c: Advanced Training now gives +1 skill halfway through
+
+ * crew.c: Crew members' relevant skills now highlighted when assigning crews to missions
+
+ * options.c: Touched up grammar in config file
+
+ * museum.c: adjusted centering in 'Naut History screen
+
+ * future.c: adjusted centering of letters in CONTINUE button
+
2011-09-29 Leon Baradat <pe...@us...>
* V271
Index: crew.c
===================================================================
RCS file: /cvsroot/raceintospace/race/crew.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- crew.c 7 Sep 2010 14:27:14 -0000 1.17
+++ crew.c 4 Mar 2012 22:54:57 -0000 1.18
@@ -370,14 +370,22 @@
if (Data->P[plr].Pool[m[i]-1].Mood<20) RectFill(88,40+i*14,94,44+i*14,0);
if (Data->P[plr].Pool[m[i]-1].Mood==0) RectFill(88,40+i*14,94,44+i*14,3);
//87 - 169
+ if (i==0) {grSetColor(11);} /* Highlight CA for command pilot */
PrintAt(87,51+i*14,"CP:");
DispNum(0,0,Data->P[plr].Pool[m[i]-1].Cap);
+ grSetColor(1);
+ if (i==1 && men>1) {grSetColor(11);} /* Highlight LM for LM pilot */
PrintAt(0,0," LM:");
DispNum(0,0,Data->P[plr].Pool[m[i]-1].LM);
+ grSetColor(1);
+ if (men==1 || ((men==2 || men==3) && i==1) || (men==4 && i>1)) {grSetColor(11);} /* Highlight EV for EVA specialist */
PrintAt(0,0," EV:");
DispNum(0,0,Data->P[plr].Pool[m[i]-1].EVA);
+ grSetColor(1);
+ if ((men==2 && i==0) || (men==3 && i==2)) {grSetColor(11);} /* Highlight DO for docking specialist */
PrintAt(0,0," DO:");
DispNum(0,0,Data->P[plr].Pool[m[i]-1].Docking);
+ grSetColor(1); /* Never highlight EN skill */
PrintAt(0,0," EN:");
DispNum(0,0,Data->P[plr].Pool[m[i]-1].Endurance);
};
Index: options.c
===================================================================
RCS file: /cvsroot/raceintospace/race/options.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- options.c 29 Jun 2011 00:56:40 -0000 1.28
+++ options.c 4 Mar 2012 22:54:57 -0000 1.29
@@ -57,7 +57,7 @@
# if HAVE_SDL_GETENV
# define getenv SDL_getenv
# else
-# warn I dont know a way to read environment on this system
+# warn I don't know a way to read environment on this system
# define getenv(a) (NULL)
# endif
#endif
@@ -66,7 +66,7 @@
LOG_DEFAULT_CATEGORY(config)
-/*set-up array for environment vars */
+/*set up array for environment vars */
static struct {
char *name;
char **dest;
@@ -106,17 +106,17 @@
{"no_backup", &options.feat_no_backup, "%u", 0,
"Set to zero to require assigning a Backup crew." }, // No Backup crew required -Leon
{"cheat_no_damage", &options.cheat_no_damage, "%u", 0,
- "Set to non-zero to disable damaged equipment (Will prevent future damage)." },
+ "Set to non-zero to disable damaged equipment (will prevent future damage)." },
{"random_eq", &options.feat_random_eq, "%u", 0,
- "Set to non-zero to enable random equipment Model (Will break game balance and possibly break the AI)." },
+ "Set to non-zero to enable random equipment model (will break game balance and possibly break the AI)." },
{"eq_name_change", &options.feat_eq_new_name, "%u", 0,
"Set to non-zero to be able to change equipment name when starting a new game." },
{"altasLunar", &options.cheat_altasOnMoon, "%u", 0,
- "Set to non-zero to enable Altas rockets in lunar missions." },
+ "Set to non-zero to enable Atlas rockets in lunar missions." },
{"succesRDMax", &options.cheat_addMaxS, "%u", 0,
- "Set to zero to make MaxRD not change with succesful missions." },
+ "Set to zero to make MaxRD not change with successful missions." },
{"boosterSafety", &options.boosterSafety, "%u", 0,
- "0: Stadistical Safety (default) - 1: Min Safety - 2: Average Safety" },
+ "0: Statistical Safety (default) - 1: Min Safety - 2: Average Safety." },
};
/** prints the minimal usage information to stderr
@@ -349,7 +349,7 @@
fix_pathsep(options.dir_gamedata);
}
-/** read the commandline options
+/** read the command-line options
*
* \return length of modified argv
*
@@ -379,7 +379,7 @@
*env_vars[i].dest = xstrdup(env_vars[i].def_val);
}
- /* setup default values */
+ /* set up default values */
options.want_audio = 1;
options.want_intro = 1;
options.want_cheats = 0;
@@ -393,8 +393,8 @@
options.cheat_no_damage=0; //Damaged Equipment Cheat, Nikakd, 10/8/10
options.feat_random_eq=0;
options.feat_eq_new_name =0;
- options.cheat_altasOnMoon=0;
- options.cheat_addMaxS=1;
+ options.cheat_altasOnMoon=0;
+ options.cheat_addMaxS=1;
options.boosterSafety=0;
fixpath_options();
@@ -479,7 +479,7 @@
shift_argv(argv + pos, argc - pos, 1);
/*
- * now we have one less arg, pos points to the next arg,
+ * now we have one fewer arg, pos points to the next arg,
* keep it this way after incrementing it on top of the loop
*/
pos--;
Index: start.c
===================================================================
RCS file: /cvsroot/raceintospace/race/start.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- start.c 26 May 2011 13:08:19 -0000 1.17
+++ start.c 4 Mar 2012 22:54:57 -0000 1.18
@@ -137,7 +137,7 @@
astro->Active++;
}
- /* Move All unassign astros to limbo */
+ /* Move All unassigned astros to limbo */
if ((astro->Una == 0)
&& (astro->Status == AST_ST_ACTIVE)
&& (astro->Assign != 0))
@@ -205,6 +205,13 @@
astro->Status = AST_ST_TRAIN_ADV_4;
else
astro->Status = AST_ST_TRAIN_ADV_3;
+
+ assert((unsigned) astro->Focus <= NUM_SKILLS);
+
+ /* Increase trained skill by 1 ('naut is halfway through adv training) */
+ char* skill = skills[astro->Focus - 1];
+ *skill = min(*skill + 1, skillMax);
+
break;
case AST_ST_TRAIN_ADV_3:
@@ -221,9 +228,9 @@
assert((unsigned) astro->Focus <= NUM_SKILLS);
- /* Increase trained skill by 2 */
+ /* Increase trained skill by 1 */
char* skill = skills[astro->Focus - 1];
- *skill = min(*skill + 2, skillMax);
+ *skill = min(*skill + 1, skillMax);
break;
}
@@ -444,7 +451,7 @@
if (Data->P[j].Other & 2)
Data->P[j].Pool[i].Mood -= random(2) + 1;
- /* Compatability */
+ /* Compatibility */
for (k = 0; k < 5; k++)
Compat[k] = 0;
cnt = 0;
@@ -502,19 +509,19 @@
temp = 0;
char sameGroup=0, group=Data->P[j].Pool[i].Group, mates=0;
for (k = 0; k < ASTRONAUT_FLT_CREW_MAX; k++)
- {
- char guyCode = Data->P[j].Crew[Data->P[j].Pool[i].Assign][Data->P[j].Pool[i].Crew-1][k]-1;
- if (guyCode>-1 && guyCode!=i) {
+ {
+ char guyCode = Data->P[j].Crew[Data->P[j].Pool[i].Assign][Data->P[j].Pool[i].Crew-1][k]-1;
+ if (guyCode>-1 && guyCode!=i) {
mates++;
for (l = 0; l < cnt; l++)
{
if (Compat[l] ==
- Data->P[j].Pool[guyCode].Compat
+ Data->P[j].Pool[guyCode].Compat
)
temp++;
- }
- if (group==Data->P[j].Pool[guyCode].Group)
- sameGroup++;
+ }
+ if (group==Data->P[j].Pool[guyCode].Group)
+ sameGroup++;
}
}
Index: museum.c
===================================================================
RCS file: /cvsroot/raceintospace/race/museum.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- museum.c 22 Jun 2010 21:11:47 -0000 1.23
+++ museum.c 4 Mar 2012 22:54:57 -0000 1.24
@@ -214,7 +214,7 @@
PrintAt(175,120,"2ND:");
PrintAt(212,120,"SUBS:");
PrintAt(254,120,"FAIL:");
- grSetColor(1);PrintAt(257,13,"CONTINUE");
+ grSetColor(1);PrintAt(255,13,"CONTINUE");
PrintAt(17,39,"FIRST:");
PrintAt(19,81,"DATE:");
grSetColor(11);PrintAt(71,37,"# SPACE FIRSTS:");
@@ -477,7 +477,7 @@
char index,yr,season,j,temp=0;
/* Okay, now we have to decide whether there are any missions displayed
- on the screen at this time. If there are any, parse the button. */
+ on the screen at this time. If there are any, parse the button. */
if(Data->P[plr].PastMis==0) return;
index=0;
season =*where % 2;
@@ -745,8 +745,8 @@
FadeOut(2,pal,5,0,0);
RectFill(1,39,157,184,3);
- DispBig(65,71,"NO",0,-1);
- DispBig(42,90,"MISSION",0,-1);
+ DispBig(68,71,"NO",0,-1);
+ DispBig(46,90,"MISSION",0,-1);
DispBig(27,109,"EXPERIENCE",0,-1);
gxGetImage(&vhptr2,22,69,133,123,0);
PatchMe(0,0,0,0,0,32);
@@ -761,7 +761,7 @@
if(plr==0) FlagSm(0,4,4);
else FlagSm(1,4,4);
grSetColor(1);
- PrintAt(259,13,"CONTINUE");
+ PrintAt(257,13,"CONTINUE");
ShBox(0,24,158,199);
ShBox(161,24,319,199);
InBox(233,29,314,80);
Index: future.c
===================================================================
RCS file: /cvsroot/raceintospace/race/future.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- future.c 30 Jul 2011 01:32:29 -0000 1.31
+++ future.c 4 Mar 2012 22:54:57 -0000 1.32
@@ -30,7 +30,7 @@
/*missStep.dat is plain text, with:
Mission Number (2 first bytes of each line)
A Coded letter, each drawing a different line (1105-1127 for all possible letters)
-Numbers folowing each letter, which are the parameters of the function
+Numbers following each letter, which are the parameters of the function
Each line must finish with a Z, so the game stops reading
Any other char is ignored, but it's easier to read for a human that way */
@@ -53,7 +53,7 @@
char D; /**< JOINT */
char E; /**< MANNED/UNMANNED/Duration 0==unmanned 1-6==duration */
char X; /**< the type of mission for assign crew and hardware */
- char Z; /**< A duaration mission only */
+ char Z; /**< A duration mission only */
} V[62];
extern int Bub_Count;
@@ -188,7 +188,7 @@
};
grSetColor(1);
PrintAt(9,80,"RESET");
- PrintAt(258,13,"CONTINUE");
+ PrintAt(256,13,"CONTINUE");
grSetColor(11);
if (Data->Season==0) PrintAt(200,9,"SPRING");
else PrintAt(205,9,"FALL");
@@ -1144,7 +1144,7 @@
#ifdef DEAD_CODE
/** Draws stuff about choosing a program and having < 2 groups available
*
- * \deprecated This function appears to be depricated.
+ * \deprecated This function appears to be deprecated.
*/
char FutBad(void)
{
Index: version.c
===================================================================
RCS file: /cvsroot/raceintospace/race/version.c,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -d -r1.256 -r1.257
--- version.c 30 Sep 2011 04:08:28 -0000 1.256
+++ version.c 4 Mar 2012 22:54:57 -0000 1.257
@@ -1 +1 @@
-271
+272
|
|
From: Leon B. <pe...@us...> - 2011-09-30 04:08:30
|
Update of /cvsroot/raceintospace/race
In directory vz-cvs-4.sog:/tmp/cvs-serv1269/race
Modified Files:
ChangeLog place.c version.c
Log Message:
Better centering of "FLIGHT CREW" in the Mission Review screen
Index: place.c
===================================================================
RCS file: /cvsroot/raceintospace/race/place.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- place.c 23 Feb 2011 12:35:34 -0000 1.39
+++ place.c 30 Sep 2011 04:08:28 -0000 1.40
@@ -607,84 +607,84 @@
AL_CALL=0;
return i;
-}
-
-void writePrestigeFirst(char index) { ///index==plr
- char w=0,i,draw=0;
- extern char PF[29][40];
+}
+
+void writePrestigeFirst(char index) { ///index==plr
+ char w=0,i,draw=0;
+ extern char PF[29][40];
for (i=0;i<28;i++)
{ //Preestige First
if (w<6 && Data->Prestige[i].Place==index && Data->PD[index][i]==0)
- {
- if (draw==0) {
- ShBox(6,170,314,197);
- RectFill(10,173,310,194,7);InBox(9,172,311,195);
- ShBox(216,156,314,172);
- RectFill(220,160,310,168,9);InBox(219,159,311,169);
- RectFill(216,171,216,171,3);
- RectFill(312,172,313,172,3);
- grSetColor(11);
- PrintAt(224,166,"PRESTIGE FIRSTS");
- draw=1;
- }
+ {
+ if (draw==0) {
+ ShBox(6,170,314,197);
+ RectFill(10,173,310,194,7);InBox(9,172,311,195);
+ ShBox(216,156,314,172);
+ RectFill(220,160,310,168,9);InBox(219,159,311,169);
+ RectFill(216,171,216,171,3);
+ RectFill(312,172,313,172,3);
grSetColor(11);
- PrintAt( w>2?170:14,
- w>2? 179+(w-3)*7:179+w*7,
+ PrintAt(224,166,"PRESTIGE FIRSTS");
+ draw=1;
+ }
+ grSetColor(11);
+ PrintAt( w>2?170:14,
+ w>2? 179+(w-3)*7:179+w*7,
&PF[i][0]);
++w;
- Data->PD[index][i]=1;
- switch (i)
- {
- case 8: if (Data->Prestige[9].Place==index && Data->PD[index][9]==0)
- {PrintAt(0,0,", E"); Data->PD[index][9]=1;}
- case 9: if (Data->Prestige[10].Place==index && Data->PD[index][10]==0)
- {PrintAt(0,0,", D"); Data->PD[index][10]=1;}
- case 10:if (Data->Prestige[11].Place==index && Data->PD[index][11]==0)
- {PrintAt(0,0,", C"); Data->PD[index][11]=1;}
- case 11:if (Data->Prestige[12].Place==index && Data->PD[index][12]==0)
- {PrintAt(0,0,", B"); Data->PD[index][12]=1; i=11;}
- case 12: i=12;
- default: break;
+ Data->PD[index][i]=1;
+ switch (i)
+ {
+ case 8: if (Data->Prestige[9].Place==index && Data->PD[index][9]==0)
+ {PrintAt(0,0,", E"); Data->PD[index][9]=1;}
+ case 9: if (Data->Prestige[10].Place==index && Data->PD[index][10]==0)
+ {PrintAt(0,0,", D"); Data->PD[index][10]=1;}
+ case 10:if (Data->Prestige[11].Place==index && Data->PD[index][11]==0)
+ {PrintAt(0,0,", C"); Data->PD[index][11]=1;}
+ case 11:if (Data->Prestige[12].Place==index && Data->PD[index][12]==0)
+ {PrintAt(0,0,", B"); Data->PD[index][12]=1; i=11;}
+ case 12: i=12;
+ default: break;
}
}
- }
+ }
for (i=0;i<28;i++)
{ //Prestige Seconds
if (w<6 && Data->Prestige[i].mPlace==index && Data->PD[index][i]==0)
- {
- if (draw==0) {
- ShBox(6,170,314,197);
- RectFill(10,173,310,194,7);InBox(9,172,311,195);
- ShBox(216,156,314,172);
- RectFill(220,160,310,168,9);InBox(219,159,311,169);
- RectFill(216,171,216,171,3);
- RectFill(312,172,313,172,3);
- grSetColor(11);
- PrintAt(224,166,"PRESTIGE FIRSTS");
- draw=1;
- }
+ {
+ if (draw==0) {
+ ShBox(6,170,314,197);
+ RectFill(10,173,310,194,7);InBox(9,172,311,195);
+ ShBox(216,156,314,172);
+ RectFill(220,160,310,168,9);InBox(219,159,311,169);
+ RectFill(216,171,216,171,3);
+ RectFill(312,172,313,172,3);
grSetColor(11);
- PrintAt( w>2?170:14,
- w>2? 179+(w-3)*7:179+w*7,
+ PrintAt(224,166,"PRESTIGE FIRSTS");
+ draw=1;
+ }
+ grSetColor(11);
+ PrintAt( w>2?170:14,
+ w>2? 179+(w-3)*7:179+w*7,
&PF[i][0]);
++w;
- Data->PD[index][i]=1;
- switch (i)
- {
- case 8: if (Data->Prestige[9].mPlace==index && Data->PD[index][9]==0)
- {PrintAt(0,0,", E"); Data->PD[index][9]=1;}
- case 9: if (Data->Prestige[10].mPlace==index && Data->PD[index][10]==0)
- {PrintAt(0,0,", D"); Data->PD[index][10]=1;}
- case 10:if (Data->Prestige[11].mPlace==index && Data->PD[index][11]==0)
- {PrintAt(0,0,", C"); Data->PD[index][11]=1;}
- case 11:if (Data->Prestige[12].mPlace==index && Data->PD[index][12]==0)
- {PrintAt(0,0,", B"); Data->PD[index][12]=1; i=11;}
- case 12: i=12;
- default: break;
- }
+ Data->PD[index][i]=1;
+ switch (i)
+ {
+ case 8: if (Data->Prestige[9].mPlace==index && Data->PD[index][9]==0)
+ {PrintAt(0,0,", E"); Data->PD[index][9]=1;}
+ case 9: if (Data->Prestige[10].mPlace==index && Data->PD[index][10]==0)
+ {PrintAt(0,0,", D"); Data->PD[index][10]=1;}
+ case 10:if (Data->Prestige[11].mPlace==index && Data->PD[index][11]==0)
+ {PrintAt(0,0,", C"); Data->PD[index][11]=1;}
+ case 11:if (Data->Prestige[12].mPlace==index && Data->PD[index][12]==0)
+ {PrintAt(0,0,", B"); Data->PD[index][12]=1; i=11;}
+ case 12: i=12;
+ default: break;
+ }
PrintAt(0,0," (2ND)");
}
- }
+ }
}
@@ -700,7 +700,7 @@
RectFill(10,34,205,44,9);InBox(9,33,206,45);
RectFill(10,49,205,119,7);InBox(9,48,206,120);
RectFill(10,124,205,164,7);InBox(9,123,206,165);
- ShBox(62,117,154,127);grSetColor(1);PrintAt(80,124,"FLIGHT CREW");
+ ShBox(62,117,154,127);grSetColor(1);PrintAt(79,124,"FLIGHT CREW");
grSetColor(11);PrintAt(58,41,"MISSION INFORMATION");
PrintAt(12,104,"MISSION DURATION: ");
Name[0]=(char)Data->P[plr].History[index].Duration+'A'-1;
@@ -788,7 +788,7 @@
}
}
-
+
writePrestigeFirst(plr);
if (mode==1) {
Index: version.c
===================================================================
RCS file: /cvsroot/raceintospace/race/version.c,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -d -r1.255 -r1.256
--- version.c 30 Jul 2011 01:32:29 -0000 1.255
+++ version.c 30 Sep 2011 04:08:28 -0000 1.256
@@ -1 +1 @@
-270
+271
Index: ChangeLog
===================================================================
RCS file: /cvsroot/raceintospace/race/ChangeLog,v
retrieving revision 1.265
retrieving revision 1.266
diff -u -d -r1.265 -r1.266
--- ChangeLog 30 Jul 2011 01:32:29 -0000 1.265
+++ ChangeLog 30 Sep 2011 04:08:28 -0000 1.266
@@ -1,3 +1,9 @@
+2011-09-29 Leon Baradat <pe...@us...>
+
+ * V271
+
+ * place.c: Better centering of "FLIGHT CREW" in the Mission Review screen
+
2011-07-29 Will Glynn <wi...@ra...>
* V270
|
|
From: Will G. <del...@us...> - 2011-07-30 01:32:32
|
Update of /cvsroot/raceintospace/race
In directory vz-cvs-4.sog:/tmp/cvs-serv30408
Modified Files:
ChangeLog aipur.c ast1.c future.c mis_c.c randomize.c
version.c
Log Message:
* V270
* checked in a bunch of changes to make the build process work in XCode 4
* rewrote C99 in-loop variable declarations ("for (int i = 0; i < n; i++)") in ANSI syntax
Index: ChangeLog
===================================================================
RCS file: /cvsroot/raceintospace/race/ChangeLog,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -d -r1.264 -r1.265
--- ChangeLog 29 Jun 2011 00:56:40 -0000 1.264
+++ ChangeLog 30 Jul 2011 01:32:29 -0000 1.265
@@ -1,3 +1,11 @@
+2011-07-29 Will Glynn <wi...@ra...>
+
+ * V270
+
+ * checked in a bunch of changes to make the build process work in XCode 4
+
+ * rewrote C99 in-loop variable declarations ("for (int i = 0; i < n; i++)") in ANSI syntax
+
2011-06-28 Pace Willisson <Pace Willisson <pa...@al...>>
* V269
@@ -46,28 +54,28 @@
* V265
- * Fixed bug that prevented compiling
-
+ * Fixed bug that prevented compiling
+
2011-06-11 Nicolas Laplume <ni...@us...>
* V264
- * Make MaxRD improve by 1 with each succesful mission (up to MaxSafety-2)
-
- * Make MaxRD change back to original MaxRD after catastrophic failures
-
- * Reduce Safety penalty in no-catastrophic failures to up to 10 (to 0 if "All systems are GO")
-
- * Fixed bug that awarded duration level if last duration step failed
-
+ * Make MaxRD improve by 1 with each succesful mission (up to MaxSafety-2)
+
+ * Make MaxRD change back to original MaxRD after catastrophic failures
+
+ * Reduce Safety penalty in no-catastrophic failures to up to 10 (to 0 if "All systems are GO")
+
+ * Fixed bug that awarded duration level if last duration step failed
+
2011-05-26 Nicolas Laplume <ni...@us...>
* V263
- * Change Booster Safety (added advanced option)
-
+ * Change Booster Safety (added advanced option)
+
* Changed 'nauts morale for crewmates
-
+
2011-05-14 Leon Baradat <pe...@us...>
* V262
Index: aipur.c
===================================================================
RCS file: /cvsroot/raceintospace/race/aipur.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- aipur.c 25 Jun 2011 20:07:10 -0000 1.18
+++ aipur.c 30 Jul 2011 01:32:29 -0000 1.19
@@ -254,7 +254,8 @@
//Naut Randomize, Nikakd, 10/8/10
void AIRandomizeNauts() {
- for (int i=0;i<106;i++) {
+ int i;
+ for (i=0;i<106;i++) {
Men[i].Cap = random(5);
Men[i].LM = random(5);
Men[i].EVA = random(5);
Index: ast1.c
===================================================================
RCS file: /cvsroot/raceintospace/race/ast1.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- ast1.c 10 Aug 2010 21:00:39 -0000 1.17
+++ ast1.c 30 Jul 2011 01:32:29 -0000 1.18
@@ -235,7 +235,8 @@
//Naut Randomize, Nikakd, 10/8/10
void RandomizeNauts() {
- for (int i=0;i<106;i++) {
+ int i;
+ for (i=0;i<106;i++) {
Men[i].Cap = random(5);
Men[i].LM = random(5);
Men[i].EVA = random(5);
Index: future.c
===================================================================
RCS file: /cvsroot/raceintospace/race/future.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- future.c 25 Jun 2011 20:07:10 -0000 1.30
+++ future.c 30 Jul 2011 01:32:29 -0000 1.31
@@ -1108,7 +1108,8 @@
}
fclose(MSteps);
- for (int n=2;missStep[n]!='Z';n++)
+ int n;
+ for (n=2;missStep[n]!='Z';n++)
switch (missStep[n]) {
case 'A': Draw_IJ (B_Mis(++n)); break;
case 'B': Draw_IJV (B_Mis(++n)); break;
Index: randomize.c
===================================================================
RCS file: /cvsroot/raceintospace/race/randomize.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- randomize.c 2 Oct 2010 23:26:22 -0000 1.3
+++ randomize.c 30 Jul 2011 01:32:29 -0000 1.4
@@ -57,7 +57,8 @@
void RandomizeEq(void) {
- for (int i=0; i<2; i++) { //for each player
+ int i;
+ for (i=0; i<2; i++) { //for each player
//Satellite
Data->P[i].Probe[0].UnitWeight = random_number (100,500);
Data->P[i].Probe[0].MaxSafety = random_number (86,98);
@@ -222,18 +223,20 @@
grSetColor(9);
PrintAt(103,59, "EQUIPMENT NAME CHANGE");
PrintAt(123,69, "(ESCAPE TO SKIP)");
- for (int n=0; skip==0 && n<3; n++)
+ int n;
+ for (n=0; skip==0 && n<3; n++)
skip = GetNewName(Data->P[plr].Probe[n].Name);
- for (int n=0; skip==0 && n<7; n++)
+ for (n=0; skip==0 && n<7; n++)
skip = GetNewName(Data->P[plr].Manned[n].Name);
- for (int n=0; skip==0 && n<4; n++)
+ for (n=0; skip==0 && n<4; n++)
skip = GetNewName(Data->P[plr].Rocket[n].Name);
}
char GetNewName (char old_name[20]) {
char ch=0, num=0, name[20];
- for(int i=0;i<20;i++) name[i]=0x00;
+ int i;
+ for(i=0;i<20;i++) name[i]=0x00;
RectFill(100,74,223,91,3);
grSetColor(6);PrintAt(162-3*strlen(old_name),80,&old_name[0]);
Index: version.c
===================================================================
RCS file: /cvsroot/raceintospace/race/version.c,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -d -r1.254 -r1.255
--- version.c 29 Jun 2011 00:56:40 -0000 1.254
+++ version.c 30 Jul 2011 01:32:29 -0000 1.255
@@ -1 +1 @@
-269
+270
Index: mis_c.c
===================================================================
RCS file: /cvsroot/raceintospace/race/mis_c.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- mis_c.c 26 May 2011 13:08:19 -0000 1.52
+++ mis_c.c 30 Jul 2011 01:32:29 -0000 1.53
@@ -30,7 +30,7 @@
#include <av.h>
#include <mmfile.h>
#include <utils.h>
-#include <logging.h>
+#include <logging.h>
#include <options.h>
#include <assert.h>
@@ -1155,7 +1155,8 @@
"first cosmonaut to");
PrintAt(30,80," walk on the moon?");
- for(int i=0;i<nauts;i++) {
+ int i;
+ for(i=0;i<nauts;i++) {
IOBox(25,100 +i*25,135,115+i*25);
grSetColor(12);
GuyDisp(45,110+i*25, MX[cPad][i].A);
@@ -1225,12 +1226,12 @@
}
}
-int RocketBoosterSafety(int safetyRocket, int safetyBooster)
-{
- if (options.boosterSafety==0)
- return ((safetyRocket * safetyBooster)/100);
- if (options.boosterSafety==1)
- return (min(safetyRocket, safetyBooster));
- else
- return ((safetyRocket + safetyBooster) /2);
-}
+int RocketBoosterSafety(int safetyRocket, int safetyBooster)
+{
+ if (options.boosterSafety==0)
+ return ((safetyRocket * safetyBooster)/100);
+ if (options.boosterSafety==1)
+ return (min(safetyRocket, safetyBooster));
+ else
+ return ((safetyRocket + safetyBooster) /2);
+}
|
|
From: Pace W. <pa...@us...> - 2011-07-28 01:27:31
|
Update of /cvsroot/raceintospace/race/os_linux In directory vz-cvs-4.sog:/tmp/cvs-serv30529/os_linux Modified Files: README Log Message: linux 1.0 build tweaks Index: README =================================================================== RCS file: /cvsroot/raceintospace/race/os_linux/README,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- README 28 Jul 2011 01:15:04 -0000 1.5 +++ README 28 Jul 2011 01:27:29 -0000 1.6 @@ -46,7 +46,7 @@ $ cd YOUR-DEVEL-DIRECTORY -$ ./race/os-linux/build-setup +$ ./race/os_linux/build-setup (watch out for switching between underlines and dashes in these names) |
|
From: Pace W. <pa...@us...> - 2011-07-28 01:15:06
|
Update of /cvsroot/raceintospace/race/os_linux In directory vz-cvs-4.sog:/tmp/cvs-serv27924/os_linux Modified Files: README Log Message: same as 1.0rc5 - just update version number to 1.0 Index: README =================================================================== RCS file: /cvsroot/raceintospace/race/os_linux/README,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- README 29 Jun 2011 00:56:41 -0000 1.4 +++ README 28 Jul 2011 01:15:04 -0000 1.5 @@ -60,6 +60,16 @@ creates the .deb in the parent directory +================================================================ +To make a .deb using launchpad: + +First make a normal deb. Then make one using pdebuild to make sure +the dependencies are ok. Finally + +cd race/build +debuild -S +dput ppa:pacew/raceintospace raceintospace_1.0rc5-1_source.changes + ================================================================ there are some remnants in the Makefile for making rpm files, but they |
|
From: Pace W. <pa...@us...> - 2011-06-29 00:56:45
|
Update of /cvsroot/raceintospace/race
In directory vz-cvs-4.sog:/tmp/cvs-serv5581
Modified Files:
ChangeLog admin.c fs.c fs.h options.c records.c version.c
Log Message:
2011-06-28 Pace Willisson <Pace Willisson <pa...@al...>>
* V269
* don't print warnings about not finding user config files
on first run; improve os_linux/README
Index: fs.c
===================================================================
RCS file: /cvsroot/raceintospace/race/fs.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- fs.c 22 Jun 2010 21:11:47 -0000 1.16
+++ fs.c 29 Jun 2011 00:56:40 -0000 1.17
@@ -234,6 +234,7 @@
where = "game data";
break;
case FT_SAVE:
+ case FT_SAVE_CHECK:
f = s_open_helper(sd, name, newmode,
"",
NULL);
@@ -274,7 +275,7 @@
assert("Unknown FT_* specified");
}
- if (f.handle == NULL)
+ if (f.handle == NULL && type != FT_SAVE_CHECK)
{
int serrno = errno;
WARNING3("can't find file `%s' in %s dir(s)", name, where);
@@ -338,7 +339,7 @@
FILE *
open_savedat(const char *name, const char *mode)
{
- return sOpen(name, mode, FT_SAVE);
+ return sOpen(name, mode, FT_SAVE_CHECK);
}
char *
Index: ChangeLog
===================================================================
RCS file: /cvsroot/raceintospace/race/ChangeLog,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -d -r1.263 -r1.264
--- ChangeLog 26 Jun 2011 03:16:27 -0000 1.263
+++ ChangeLog 29 Jun 2011 00:56:40 -0000 1.264
@@ -1,3 +1,10 @@
+2011-06-28 Pace Willisson <Pace Willisson <pa...@al...>>
+
+ * V269
+
+ * don't print warnings about not finding user config files
+ on first run; improve os_linux/README
+
2011-06-25 Pace Willisson <pa...@al...>
* more linux development notes
Index: options.c
===================================================================
RCS file: /cvsroot/raceintospace/race/options.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- options.c 11 Jun 2011 20:17:12 -0000 1.27
+++ options.c 29 Jun 2011 00:56:40 -0000 1.28
@@ -212,7 +212,7 @@
if (!f)
{
- WARNING1("could not open config file");
+ INFO1("could not open config file");
return -1;
}
Index: fs.h
===================================================================
RCS file: /cvsroot/raceintospace/race/fs.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- fs.h 22 Jun 2010 21:11:47 -0000 1.7
+++ fs.h 29 Jun 2011 00:56:40 -0000 1.8
@@ -15,7 +15,8 @@
FT_AUDIO,
FT_VIDEO,
FT_IMAGE,
- FT_MIDI
+ FT_MIDI,
+ FT_SAVE_CHECK, /* Ok for open to fail - don't print warning. */
};
/** used for saved games */
Index: records.c
===================================================================
RCS file: /cvsroot/raceintospace/race/records.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- records.c 22 Jun 2010 21:11:47 -0000 1.10
+++ records.c 29 Jun 2011 00:56:40 -0000 1.11
@@ -42,7 +42,7 @@
FILE *file;
int i,j;
- if ((file = sOpen("RECORDS.DAT","rb",1))==NULL)
+ if ((file = sOpen("RECORDS.DAT","rb",FT_SAVE_CHECK))==NULL)
{
file=sOpen("RECORDS.DAT","wb",1);
if (file == NULL) {
Index: version.c
===================================================================
RCS file: /cvsroot/raceintospace/race/version.c,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -d -r1.253 -r1.254
--- version.c 25 Jun 2011 20:07:10 -0000 1.253
+++ version.c 29 Jun 2011 00:56:40 -0000 1.254
@@ -1 +1 @@
-268
+269
Index: admin.c
===================================================================
RCS file: /cvsroot/raceintospace/race/admin.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- admin.c 11 Jun 2011 20:17:12 -0000 1.40
+++ admin.c 29 Jun 2011 00:56:40 -0000 1.41
@@ -571,7 +571,7 @@
if (fin) fclose(fin);
i++;
sprintf(Name,"BUZZ%d.SAV",i);
- fin=sOpen(Name,"rb",1);
+ fin=sOpen(Name,"rb",FT_SAVE_CHECK);
} while (fin!=NULL); // Find unique name
fin=sOpen(Name,"wb",1);
}
|
|
From: Pace W. <pa...@us...> - 2011-06-29 00:56:43
|
Update of /cvsroot/raceintospace/race/os_linux In directory vz-cvs-4.sog:/tmp/cvs-serv5581/os_linux Modified Files: README Log Message: 2011-06-28 Pace Willisson <Pace Willisson <pa...@al...>> * V269 * don't print warnings about not finding user config files on first run; improve os_linux/README Index: README =================================================================== RCS file: /cvsroot/raceintospace/race/os_linux/README,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- README 26 Jun 2011 03:16:28 -0000 1.3 +++ README 29 Jun 2011 00:56:41 -0000 1.4 @@ -1,16 +1,29 @@ To set up the developement directory structure: +For project developers with Sourceforge write access: + $ mkdir YOUR-DEVEL-DIRECTORY $ cd YOUR-DEVEL-DIRECTORY -$ cvs -d:ext:raceintospace.cvs.sourceforge.net:/cvsroot/raceintospace co race -$ cvs -d:ext:raceintospace.cvs.sourceforge.net:/cvsroot/raceintospace co gamedat -$ git clone ssh://raceintospace.git.sourceforge.net/gitroot/raceintospace/avdata + +$ cvs -d:ext:SF...@ra...:/cvsroot/raceintospace co race +$ cvs -d:ext:SF...@ra...:/cvsroot/raceintospace co gamedat +$ git clone ssh://SFNAME@raceintospace.git.sourceforge.net/gitroot/raceintospace/avdata + +For developers without write access: + +$ mkdir YOUR-DEVEL-DIRECTORY +$ cd YOUR-DEVEL-DIRECTORY +$ cvs -d:pserver:ano...@ra...:/cvsroot/raceintospace login +$ cvs -z3 -d:pserver:ano...@ra...:/cvsroot/raceintospace co race +$ cvs -z3 -d:pserver:ano...@ra...:/cvsroot/raceintospace co gamedat +$ git clone git://raceintospace.git.sourceforge.net/gitroot/raceintospace/avdata For ordinary development $ cd YOUR-DEVEL-DIRECTORY/race $ aclocal -I m4 $ autoconf +$ configure $ make # make install |
|
From: Pace W. <pa...@us...> - 2011-06-26 03:16:30
|
Update of /cvsroot/raceintospace/race/debian In directory vz-cvs-4.sog:/tmp/cvs-serv27729/debian Modified Files: changelog Log Message: linux development support Index: changelog =================================================================== RCS file: /cvsroot/raceintospace/race/debian/changelog,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- changelog 26 Jun 2011 01:35:07 -0000 1.5 +++ changelog 26 Jun 2011 03:16:28 -0000 1.6 @@ -1,4 +1,10 @@ -raceintospace (1.0rc3-1) unstable; urgency=low +raceintospace (1.0rc4-1) lucid; urgency=low + + * more scripts for development + + -- Pace Willisson <pa...@al...> Sat, 25 Jun 2011 23:15:55 -0400 + +raceintospace (1.0rc3-1) lucid; urgency=low * insert into games menu; update icon |
|
From: Pace W. <pa...@us...> - 2011-06-26 01:35:09
|
Update of /cvsroot/raceintospace/race/os_linux In directory vz-cvs-4.sog:/tmp/cvs-serv13894/os_linux Modified Files: README raceintospace.xpm Added Files: 6870605.jpg Log Message: debian menu, icon Index: README =================================================================== RCS file: /cvsroot/raceintospace/race/os_linux/README,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- README 25 Jun 2011 00:42:59 -0000 1.1 +++ README 26 Jun 2011 01:35:07 -0000 1.2 @@ -6,6 +6,14 @@ $ cvs -d:ext:raceintospace.cvs.sourceforge.net:/cvsroot/raceintospace co gamedat $ git clone ssh://raceintospace.git.sourceforge.net/gitroot/raceintospace/avdata +For ordinary development + +$ cd race/race +$ aclocal -I m4 +$ autoconf +$ make +# make install + ================================================================ To make a distribution tarball: @@ -14,7 +22,7 @@ (now you're in the development directory, and have race gamedat and avdata subdirectories) -$ ./race/make-tarball RELEASE-NUBMER +$ ./race/make-tarball RELEASE-NUMBER (for example ./race/make-tarball 1.0rc1) @@ -34,9 +42,17 @@ cd raceintospace-REL debuild -create the .deb in the parent directory +creates the .deb in the parent directory ================================================================ there are some remnants in the Makefile for making rpm files, but they probably don't work any more + +================================================================ + +the icon image is from +http://mix.msfc.nasa.gov/IMAGES/MEDIUM/6870605.jpg +"AS-205 Launch" (Apollo 7) + + --- NEW FILE: 6870605.jpg --- (This appears to be a binary file; contents omitted.) Index: raceintospace.xpm =================================================================== RCS file: /cvsroot/raceintospace/race/os_linux/raceintospace.xpm,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- raceintospace.xpm 24 Jun 2011 23:16:20 -0000 1.1 +++ raceintospace.xpm 26 Jun 2011 01:35:07 -0000 1.2 @@ -1,452 +1,664 @@ /* XPM */ -static char *icon[] = { +static char *raceintospace[] = { /* columns rows colors chars-per-pixel */ -"190 190 256 2 ", -" c #4D392D", -". c #573C29", -"X c #5A3E2C", -"o c #4D3C36", -"O c #533D33", -"+ c #5B3E32", [...1081 lines suppressed...] +"zXcXcXcXcXcXcXcXcXxXxXcXcXcXxXxXxXxXxXxXhXlXxXhXhXhXhXhXhXhXgXhXxXhXsXgXhXgXsXgXdXaXfXsXsXsXsXsXsXaXsXsX-XsX-XaXsXsX-XsX[.,XsX-XsXsX].,X,X-X;XsX-X,X,X-X,X,XsX-X-X;X-X;X-X&X-X;X;X;X&X&X&X:X&X&X*X:X,X>X;X>X>X;X>X&X,X,X&X,X&X,X,X*X,X>X>X>X>X3X3X3XjXkXvXbXbXbXbXNXbXbXNXbXNXbXbXbXBXNXNXBXNXBXCXNXVXAXAXAXKXIXIXUXIXUXLXLXIXIXIXLXLXIXLXLXIXDXIXIXLXLXLXLXLXIXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXIXLXUXUXUXUXUXIXIXIXUXUXUXIXIXKXIXSXAXAXAXiXAXBXCXAXAXAXCXVXCXCXBXBXiXBXtXBXBXBXBXtXBXBXtXBXbXtXeXeXeXeXeXeXtXtXwXtXtXqXeXqXeX0XeX0X5X4X2X<X<X<X<X*X%X*X*X%X%X*X*X&X&X,X&X,X;X&X,X&X&X&X@X$X&X-X&X-X&X&X@X$X@X#X#X'.@X#X@X'.'.@X'.'.'.@X#X'.#X@X#X#X'.'.'.'.-X'.'.].].-X].].-X].'.'.'.=X].].].].'.].].].'.'.].].].].].].u.'.'.=X@X$X:X*X<X1X<X2X<X<X<X1X2X2X4X4XeX0XqXqX7X0X0XqX7XqX7XqXwXwXwXwXwXwXwXwXwXwXwXtXiX", +"cXcXcXcXcXcXcXcXcXcXcXcXxXcXxXxXcXhXhXhXxXhXhXhXxXhXxXgXgXhXhXhXxXhXhXgXhXsXgXsXsXsXsXsXsXsXsXsXsX[.sXsXsXsX].[.dXsXsX[.sX].sXsX].sX,X-X[.sX-X,X-X].sX,X].sX*X,X-X&X;X,X].-X,X,X'.,X,X,X,X;X;X,X*X,X>X>X,X*X,X,X&X&X,X;X;X;X&X,X&X>X>X>X>X>X3X3X3X5XjX5XbXbXbXNXNXbXBXNXNXBXbXNXbXNXBXNXBXBXBXCXCXZXAXCXBXAXKXKXIXUXUXIXLXLXUXIXIXLXLXKXDXLXUXUXUXUXIXLXLXDXIXIXIXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXIXIXUXUXUXIXIXPXKXKXSXAXVXVXVXVXVXAXAXAXAXVXVXVXVXBXBXBXBXBXiXBXBXtXBXBXtXbXtXtXeXeXeXeXeXeXtXtXtXwXeXeXtX0X7XeXeXeX1X2X2XjX1X<X*X*X*X<X%X*X&X*X*X*X&X*X&X;X&X;X:X;X-X&X&X-X&X'.&X'.'.&X'.@X@X'.@X'.'.'.@X'.'.R @X'.'.(.@X'.#X'.@X'.'.#X#X'.=X=X=X'.'.].].'.-X'.].-X'.].].].].].].'.].].'.'.'.].'.'.].].'.].].'.'.'.5X*X<X2X5X6X2X2X6X2X2X4XeX4XeX0XqX0X0XwX0X7X0XwXqXqX7XwXwXwXwXwXwXtXwXwXiXiXwX", +"cXcXcXcXcXcXcXcXcXcXcXcXcXcXjXxXcXhXxXcXxXhXhXcXxXhXxXxXxXhXhXgXhXgXgXsXgXhXsXhXsXsXhXsXhXsXsXsXsXsXsXsXsX].5X[.,X'.].].sX,X,XsXsX,X-X,X,X-X-X,XsX,X-X-X,X].&XsX,X;X,X'.,X&X,X'.&X&X&X*X*X&X*X*X*X,X>X,X,X3X3X,X&X&X&X;X;X&X&X*X*X&X*X>X>X3X,X3X5XjXkXvXbXNXNXNXNXNXBXNXNXNXCXCXBXCXNXNXBXNXCXCXAXHXAXCXCXKXKXKXLXIXLXLXSXKXIXIXLXLXLXKXLXLXUXUXUXUXUXIXIXIXIXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXLXKXLXKXKXKXSXVXVXVXVXAXAXAXAXAXVXAXVXVXBXVXBXBXBXBXBXtXBXtXtXBXbXtXtXbXeXeXeXeXeXeXeXtXtX0XtXeXeXeXeXeXeXeX2X1X1X1X<X*X*X*X*X%X%X<X*X*X>X*X%X&X&X>X;X&X;X&X&X$X&X&X&X&X&X&X&X&X'.&X@X@X@X@X@X'.'.'.@X'.R @X@X8.@X'.@X'.'.'.#X'.-X#X'.'.'.#X-X'.].].].'.].].'.'.'.].'.'.'.].].].].].,X].'.'.'.'.'.].'.*X*X*X5X5X5X4X6X4X2X4X4X2X4X4XeX0X0X0X0X0XwX0XwXqXwX7XwX7XwXwXwXwX9XwXwXiXwXwXwXiX", +"cXcXcXcXcXcXcXcXcXcXcXxXxXcXcXxXhXcXcXcXxXhXxXhXhXxXgXgXhXhXhXhXhXgXhXhXsXhXhXgXsXhXsXhXsXsXsXsXsXhXsXsX5X[.].sX].,X].,XsX].].].-XsX,X-X,X].sX-XdX'.;X,X,X,X,XsX'.&X&X&X,X].,X-X;X&X&X;X,X*X,X>X*X>X>X,X,X,X>X;X,X&X&X;X,X&X&X&X>X;X>X>X>X>X3X3X5XkXkXvXbXNXNXNXCXNXCXNXCXZXCXCXCXCXCXCXCXCXHXHXAXAXAXZXAXSXKXLXIXIXKXSXSXLXLXLXLXLXLXLXLXIXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXLXLXKXPXKXKXAXAXVXVXVXAXAXAXAXAXVXAXVXVXVXBXBXBXBXBXBXBXBXBXBXBXtXbXtXtXeXeXeX7XeXeXtXeXtX0XeXtXeXtXeXeXeX2X2X1X2X1X<X*X*X*X<X%X*X&X%X>X:X>X*X&X*X%X;X&X,X;X;X#X$X&X&X'.&X'.'.&X&X'.'.@X&X'.oX'.'.'.'.'.'.'.@X'.0.@X@X'.#X#X#X'.#X'.'.].=X].-X].-X].-X-X].].'.'.,X].].,X].'.'.'.].].'.].].].'.].'.,X'.*X*X<X2X5X2X5X4X4XeX4X4X2X0X0X0X0XqXeX0XtXeXwXqXwXqXqXwXwXwX7X7XwXwXwXwXwXwXiXwXtX", +"cXcXcXcXcXcXcXcXcXcXcXxXxXxXxXxXcXhXhXhXxXhXhXcXxXhXhXhXhXhXhXhXhXsXgXhXhXgXgXhXhXsXsXsXsXsXgXsXsX[.5X].sX[.,XsXsXsXsXsX,X,XsXsXsX-X-X,XsX-X-XsX,X&XsX-XsX,X'.,X,XsX,XsX,X,X;X;X;X,X;X&X&X,X&X*X*X>X>X>X>X*X,X&X,X&X&X;X&X&X*X,X>X>X>X*X>X3X3X3XjXkXkXMXbXNXCXCXCXCXCXCXCXCXHXAXHXCXHXCXHXCXCXHXKXKXSXSXAXKXLXPXIXIXIXLXKXLXKXSXKXKXKXLXLXIXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXIXIXKXLXKXLXSXSXAXAXAXAXAXAXAXAXAXAXAXAXVXVXVXCXBXBXBXBXBXtXtXBXtXbXtXtXeXtXeXeXeXtXeXtXtXeXwXtX7XeXeXeX7X2XeX2X2X1X1X<X<X*X*X*X*X*X*X*X:X*X:X:X:X>X>X;X*X;X;X;X;X;X&X&X'.&X&X&X'.'.&X&X@X&X'.'.'.oX@XoX'.@X'.8.0.@X'.#X#X'.'.'.#X#X#X#X#X$X=X'.].'.].].].'.].,X'.].].].].].'.].'.'.].].].].].'.].,X'.&X'.*X5X5X5X5X4X4X4X4X4X2X2X2XeX4X0XrXqXqXqXqXeXqXwX7XqX0XwXwXwXwXwXwXwXwXwXwXwXiXtX", +"cXcXcXcXcXcXcXcXcXcXcXcXxXxXxXcXcXhXhXhXcXhXhXxXhXhXhXhXhXhXhXhXhXhXhXsXsXsXhXsXhXsXhXsXsXsXsXhXsXsXsXdXsXsX[.dXsX].sX].].sXsX,XsX-X,XsXsX,X].,X,XsXdX,X-X,X].,X,X].,X;XsX;X*X-X;X;X;X*X,X,X*X,X>X>X>X,X>X>X*X,X;X&X;X;X&X&X&X*X*X>X>X>X>X,X>X5X5XkXvXbXNXNXNXZXHXCXNXHXCXHXHXHXHXAXAXAXCXHXHXPXIXKXIXIXLXIXIXIXIXIXUXIXIXLXLXLXLXKXLXLXLXIXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXIXIXKXKXLXKXSXSXAXAXAXSXAXAXAXAXAXAXVXVXAXCXVXCXBXBXBXBXbXBXBXtXbXtXtXtXeXeXtXeXeXtXtX0XtXeXwXeX0X7XeXeX0X0X2X2X2X1X1X<X*X<X<X<X*X*X*X>X*X&X*X*X:X*X:X,X;X,X;X;X,X&X&X,X&X'.*X&X'.'.@X&X'.&X@X@X'.'.@X@X(.#X'.#X#X#X'.@X'.@X#X@X#X'.'.=X=X-X=X'.=X].'.].'.].].'.].].].'.].].'.'.'.].].].].'.'.'.'.,X'.>X;X1X1X5X6X6X4X6X0X6X6X4X4X4X4X4XeXeX0XeXtXwXqXwXqX0XqXwX7X0XwXwXwXwXwXwXwXwXwXwXtX", +"cXcXcXcXcXcXcXcXcXcXhXhXxXxXcXxXcXxXcXxXxXxXhXcXxXhXhXhXhXhXhXhXsXhXhXhXsXgXsXsXsXsXsXsXsXsXsXsXsXsXsXsX].,X,XsXsX,XsXsXsX].].].].,XsX-X].&X;XsX,X,X-X*X,X-X,X].sX,X,XsX&X;X&X*X,X;X;X&X&X*X,X*X,X3X3X>X,X,X&X*X&X&X;X&X,X&X&X&X*X>X,X>X>X3X3X3X5XvXbXbXNXFXCXZXCXCXCXHXHXHXHXHXKXHXHXHXHXHXPXPXIXIXIXIXIXIXUXIXIXUXUXUXUXLXIXIXIXLXLXLXLXIXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXIXUXIXKXKXLXSXKXSXSXSXAXAXAXAXAXAXAXAXAXAXCXCXVXCXBXBXCXBXBXBXBXBXBXtXtXtXtXtXtXtX7X7XeXtX0XtX7X0XwXeXeX0XeX0XeX2X2X1X1X*X<X>X>X*X*X*X*X*X*X>X*X&X*X:X:X&X;X;X&X;X&X-X&X*X'.&X'.&X@X*X&X@X@X'.@X@X@X@X@X'.@X#X#X#X'.'.#X'.'.'.#X].-X'.'.=X=X=X'.=X=X-X'.].'.'.].].].].].].].,X'.'.,X'.'.].].sX].'.5X,X'.>X>X<X1X4X5X6XeX0X6X0X6X4X4X4X4XeXeXqXqXqXtXrXwXwXwXwXwX0XwXqXwXwXwXwXwXiXwXwXwXwXtX", +"cXcXcXcXcXcXcXcXxXcXcXcXcXhXxXxXcXhXhXcXcXhXcXhXhXhXhXhXhXhXhXhXhXhXsXsXsXsXhXsXsXsXsXsXsXsXsXsXsXdXsX].hXsX].dXsX,X,X].[.].dXsXsX,X,XsXsX;X-X,X,X,X;XsX,X,XsX,X&X,X,X&X,X;X,X-X,X;X,X*X*X,X,X,X,X3X>X>X>X>X,X,X*X&X&X&X*X&X*X*X*X,X,X,X>X3X3XkXkXkXMXNXNXCXNXZXGXCXGXHXHXHXHXHXHXHXSXSXSXKXPXPXIXLXIXIXIXIXIXUXUXUXUXUXUXUXUXIXUXLXLXLXLXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXIXUXIXIXKXSXLXKXKXSXSXSXSXSXSXSXAXAXAXAXAXAXCXCXCXCXCXVXBXBXBXBXBXBXtXtXtXtXtXeX7XtXeX7XtX0XwXtX0X7X7XeXeX0XeXeX2X6X2X1X1X3X*X<X3X>X*X3X*X*X*X<X>X>X>X>X;X&X,X,X&X&X;X&X&X'.*X'.&X'.&X&X'.@X'.&X'.@X'.@X'.@X8.#X#X'.'.#X#X'.@X@X#X=X=X'.@X=X-X-X-X'.-X'.-X].].].].,X'.,X].].].,X'.'.].'.].].].,X'.'.].5X5X3X1X3X6X5X6X6XeX0XeX0X4X6X6X4X6X0XeX0XrXrXtXrXwXwXwXqXqXwXqXwXwX7XwXwXwXwXwXwXwXwXtX", +"cXcXcXcXcXcXcXcXcXcXcXcXcXcXxXxXcXhXxXhXcXhXhXcXhXcXhXhXhXxXhXsXhXsXhXhXhXhXsXhXhXsXsXsXhXsXsXsXsXsXsXsXsX,XdXdXsX].sXdXdX,X,XdXsX].,XsX].,XsX-X].sX,X-X].,X,X&X,X].,X'.,X;X,X*X,X;X,X&X,X,X>X,X>X>X>X3X>X,X>X*X*X&X&X&X&X,X*X*X*X>X>X3X3X3X3XkXvXMXMXNXCXCXZXZXCXGXHXCXCXHXAXHXSXSXKXHXAXSXKXKXKXIXLXLXIXIXUXUXIXUXUXUXUXUXUXUXUXUXIXLXIXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXIXKXLXKXKXKXKXSXSXAXAXAXAXVXSXAXAXVXAXAXCXVXVXCXCXBXBXBXBXBXtXBXtXtXtXtXtXtXtXtXtXtXtXtX0X0XwXeXeXeX7X0X0X2XeX1X2X1X1X<X3X*X*X>X<X>X>X*X*X>X&X>X:X>X>X,X;X;X;X&X&X&X,X&X*X*X&X'.&X&X'.&X@X'.@X&X'.@X@X#X#X@X'.@X@X#X#X@X'.=X#X#X#X'.-X#X=X=X-X'.'.].].'.,X].].'.].'.'.'.'.].].].'.].'.'.'.'.].'.].].5X1X5X5X2X5X6X6X4X6XeX6X5X0XrXqX6XeXeXrXwXwXtXwXwXwXwXtXwXwXwX7XwXwXwX7XwXwXwXwXiXtXwX", +"cXcXcXcXxXcXxXcXxXcXcXcXcXcXxXhXhXcXcXcXhXhXhXhXhXhXhXxXhXhXgXhXhXhXsXhXhXsXhX5XhXsXsXsXsXsXsX'.].sX5X[.sXsXsXsXsX,X,XsX,X].sXsXsX;XsX,X].dX].,X,X].,X,X,X,XsX,X,X,X].,X,X,X*X,X,X'.,X*X,X*X>X>X>X>X5X>X3X>X,X*X&X&X&X;X*X&X,X*X>X>X>X>X3X3X5XkXvXnXNXCXNXGXCXCXHXGXHXAXHXAXAXHXHXHXSXHXAXHXAXKXSXKXLXIXIXIXUXUXIXIXIXUXUXUXIXUXUXUXIXIXIXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXIXIXIXKXKXSXSXKXSXAXAXSXAXAXAXAXAXVXVXAXAXCXCXCXCXBXCXVXBXBXBXBXtXtXtXtXtXtXtXtXtXtXeXtXtX7XtXeXeX7XeX7X2X2XeX1X2X2X1X1X1X<X<X<X>X3X>X*X<X*X>X:X>X%X*X:X>X,X,X&X&X&X,X,X*X&X&X&X*X'.oX&XoX'.'.&X@X@X'.@X$X#X#X@X@X@X'.#X'.'.#X#X-X-X'.-X].'.'.].].].'.].'.].,X].].].].'.,X].'.'.'.].,X'.'.].].].,X].].,X3X5X5X1X6X6X6X6X6XeX6X2XeXeXeXeXeXeXeXtXtXtXtXwXtXwXtXwXwX0XwXwXwXtXwXwXwXwXwXwXwXwX", +"cX.XcXcXxXxXxXxXcXhXhXcXjXcXhXxXxXcXhXcXcXcXhXxXhXhXxXhXhXhXhXgXsXhXsXsXhXsXsXsXsXsXsXsXsXsXsXsXhXhX[.,XsX].,XsXsX].dXsXsX,X,X'.-XsX&X-X-X,X,X].].,X'.].].'.&X,X].*X,X,X;X;X&X&X&X,X,X*X,X,X>X>X>X,X*X,X,X>X,X>X,X&X*X*X&X,X,X*X*X>X1X>X>XjX3XkXbXbXNXNXCXCXHXFXNXCXCXHXAXAXHXAXHXSXHXSXSXKXKXAXKXKXIXIXIXUXUXUXIXLXLXLXIXIXLXIXIXIXIXIXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXIXIXIXKXKXSXLXKXSXSXSXSXSXAXAXAXVXAXAXAXAXAXCXCXCXBXCXVXBXBXtXBXtXtXtXtXtXtXtXtX7XtX7XtXtXeXtXeX7XeXeX7X0X7XeX2X2X1X1X1X1X1X1X3X*X<X3X3X>X*X:X<X*X>X>X:X:X*X,X,X&X&X&X;X&X;X-X;X-X'.*X&X'.&X&X'.@X&X'.@X&X@X#X'.@X@X'.'.@X&X'.@X#X#X@X'.'.,X'.&X].].'.,X,X].'.].].'.,X].'.'.].].].'.].'.'.,X].'.].].].].,X3X3X4X5X6X4X5XeXeX6X4X6X4XeXeXrXeXwXeXtXwXtXtXtXtXwXtXtXwXwXwX0XwXwXwX0X7XwXwXwXwXwX", +"cXcX.XcXcXcXcXxXxXxXxXhXxXhXcXcXcXhXxXhXhXhXcXxXxXhXhXhXhXhXgXhXhXhXhXsXhXsXhXsXsXsXhXsX,XsXsXsXsX].sXsXsXsX,XsXdX[.sXsXsX].sX,X,X-X'.*X,XsX&X,X,X,X,X&X,X,X'.,X,X*X,X].;X*X;X&X*X,X*X*X,X*X>X>X3X>X5X,X3X>X,X,X;X*X&X'.*X*X,X*X>X>X_.3X3XkXkXvXbXbXCXNXFXCXCXCXHXCXHXAXAXHXAXHXAXSXKXHXAXKXSXKXKXPXIXUXUXUXUXUXUXKXKXLXLXIXLXLXIXIXIXIXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXIXIXLXLXKXSXKXKXSXSXSXSXSXSXAXAXAXAXAXVXVXVXVXVXVXVXCXBXBXBXBXtXBXBXtXtXtXtXtXtXtXtX7XtX7XtX7X0X0X0X0X2X0X1XeX2X2X1X1X1X1X1X3X3X<X*X3X>X*X>X*X*X*X:X>X:X<X*X>X&X&X>X,X;X,X;X&X&X;X&X'.&X'.&X'.@X'.'.@X@X@X@X@X'.@X@X#X@X#X&X'.@X'.&X'.'.#X'.'.*X'.].].].].'.].].].'.].].].,X'.'.,X].].'.'.'.].,X].].].'.,X>X>X3X5X6X6X6X4X6X2X6X6XeXeXrXrXtXrXrXeXtXtXtXtXtXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwX", +"cXcXcXcXcXcXcXhXcXxXxXcXhXxXxXhXhXxXhXhXhXhX5XcXhXhXhXhXhXxXhXhXhXhXsXsXhXsXsXhXsXsXsXsXsXsXsXsXsXsXsX,XsX].sX].dX5X5X[.dX,XdX].sXsX,XsX].,X'.;X;XsX*X'.sX&X*X'.,X'.*X,X;X,X;X*X,X&X*X,X,X,X5X>X3X3X>X5X>X3X3X>X,X*X,X*X*X*X,X,X3X3X3X1X3XkXkXvXbXnXNXNXGXCXGXCXCXHXHXCXAXAXHXAXSXHXSXSXKXAXKXKXKXLXUXUXUXUXUXUXUXIXIXIXLXKXIXLXIXIXUXIXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXIXIXIXIXLXKXKXSXLXSXSXSXAXAXSXAXAXAXAXCXAXVXVXVXBXVXVXCXBXBXBXBXtXtXtXtXtXtX7XtXtXeXtXtXtX7XtXeXeX0XeX7XeX7X2X2X2X1X1X1X1X1X3X>X<X*X<X>X*X*X1X>X*X<X*X>X>X*X>X>X*X>X,X&X,X&X&X;X&X&X*X'.&X&X&X@X@X&X'.&X'.@X#X#X@X@X@X#X#X#X'.@X'.'.].-X&X'.'.&X].'.'.,X'.,X,X'.,X'.'.].].'.'.'.'.'.].'.'.,X].].].].].].].].-X>X>X5X4X6X6X6X6X6X2X2X6XeXeXrXeXtXtXrXtXtXtXtXtXwXwXwXwXwXwXwXwXwXwXwX0XwXwXwXwXwX", +"cXcXcXcXxXxXcXcXcXxXcXhXxXhXhXxXhXhXcXxXhXxXhXxXhXhXhXhXhXhXhXhXsXhXhXsXhXsXsXsXsXsXsXsXsXsXsXsXsXsX,X].[.sXsXsX].5XsX,X].].dX,XsX,X,X;X-X&X,X-X;X,X;X'.,X&X&X*X'.,X,X,X*X,X;X,X&X,X,X&X,X,X>X*X*X5X,X3X5X,X>X,X>X,X,X,X*X>X5X,X_.1X1X6XjXjXkXbXNXNXNXCXCXZXZXGXHXGXHXCXAXHXAXAXHXSXHXSXKXKXSXKXKXKXIXIXUXUXUXUXUXUXUXUXIXIXIXIXIXIXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXIXIXIXIXKXKXSXSXSXSXSXSXSXAXAXAXAXAXVXAXVXCXVXCXVXVXCXBXBXBXBXtXtXtXtXtXtXtXtXtXtXtXtXwXeXtXtXtXeXeX0XeX2X2XeX2X6X1X2X1X1X1X3X<X*X3X1X1X<X*X:X*X*X<X*X*X>X>X>X>X>X*X;X*X>X;X&X;X&X].*X&X&X&X&X'.@X&X&X'.'.@X@X'.@X#X#X@X@X=X'.@X'.&X'.;XsX&X,X,X].'.'.,X'.].'.].'.].'.].'.'.].].'.].'.'.].].,X].].'.].].].'.].,X,X3X5X6X6X6X6X2X2X6X4XeX0XeXtXtXeXtXrXmXtXuXtXwXtXwXwXwXwXwXwXeXwXtXwXwXwX0XwX0X", +"cXcXcXcXcXxXxXxXxXhXcXcXcXxXhXxXxXxXhXhXhXhXhXhXhXhXhXhXhXhXsXhXhXsXsXhXhXsXsXhXsXsXsXsXsXsXsX'.sXsXsXhX5X].].hX[.sX].sXdX,XsXsX].,X].sX,XsX-X,X&X].,X,X&X,X'.,X'.,X'.&X'.,X*X-X&X*X*X,X,X*X,X,X5X>X3X,X,XjX5X3X5X,X3X,X,X>X>X>XjX1XjXjXeXkXbXnXbXNXNXNXGXCXGXCXCXCXHXCXAXHXHXHXHXHXSXSXKXAXSXKXKXKXKXLXKXIXUXUXUXUXUXUXIXIXLXLXIXIXIXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXIXIXIXIXLXSXKXSXSXSXSXSXAXSXAXAXAXAXAXCXAXVXAXVXBXCXCXCXBXBXBXbXBXtXtXtXtXtXtXtXtXeX0XtXwXwX7XeXeX7X0X0X0X2X2X2X2X2X2X1X1X1X3X<X3X<X>X>X3X1X*X<X>X>X>X>X3X:X>X,X>X*X>X;X,X&X&X&X&X&X*X'.'.*X'.&X@X'.&X&X@X@X@X@X&X#X@X#X$X#X-X'.&X'.-X'.'.;X'.'.].'.-X].].].'.'.'.'.,X].,X].,X'.'.'.,X].].].'.].].,XsX].,X'.'.-X,X3X3XjX3X2X1X5X3X3X1X6X6XvXeXbXbXrXtXrXbXtXeXtXtXwXeXtXtX0XwXwXwX0XwX0X0XwX0XwX", +"cXcX.XcXcXcXxXxXxXhXhXcXxXxXhXxXxXhXhXhXxXhXhXhXhXhXhXhXsXhXsXhXsXgXsXhXhXhXsXsXsX5XsXsXsXsX,XsXsXsXsX,X5X[.5XsXsX,X[.sXdXsX'.5X,X-X-XsX].,X,X].'.,X-X*X,X&X].&X*X*X&X&X,X&X*X*X,X&X,X*X*X*X,X5X,X5X5X,X,X3XjX5X,X3X,X,X3X3X5X5XjX6XjXjXkXkXbXbXbXNXNXNXZXFXNXCXCXHXCXHXHXAXAXAXHXAXHXKXPXKXAXKXKXSXKXKXLXIXUXUXUXUXUXUXIXLXIXLXIXIXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXIXIXIXLXSXDXKXSXAXAXSXAXAXAXAXVXAXAXVXVXVXBXVXVXCXCXBXBXBXbXtXtXtXtXtXeXtXtXtXtXeXwXwXtX0XtXeXeXeX0X4X7X2X0X2X2X2X2X1X1X1X1X3X<X3X1X1X3X>X*X3X<X:X:X>X3X:X>X*X,X,X;X,X&X&X*X&X&X&X&X*X&X'.&X&X&X'.@X@X@X'.@X#X@X@X@X#X#X#X'.&X'.'.'.'.&X'.].&X&X'.'.-X'.-X,X].,X,X].,X'.].].'.'.,X'.'.'.'.,X].].].].].].'.].;X,X,X3X3X3X3X3X3X3X3X6X6X6XeXeXvXrXrXtXrX6XuXtXtXtX0XwXwXwXwX0XwXwXwXwXwXtXtX0XwX", +".XcXcXcXxXhXxXcXhXcXhXhXxXxXxXhXhXhXxXhXhXhXhXhXhXhXhXsXgXhXhXsXhXsXsXsXsXsXsXsXsXsXsXsXsXsXsXsXdXhX].sXsX].[.dX].sX5X].,X].sX].dX].,X,X].,X'.,X,X&X-X-X'.*X;X&X,X'.&X&X,X*X&X&X&X,X*X,X>X5X,X>X,X3XjX3X5X3X3X3XjX5X5X,X5XdX5XjXjXeXkXkXkXbXnXbXbXBXNXFXNXCXZXZXHXCXCXCXAXAXAXHXHXSXKXHXSXSXSXSXSXSXHXLXLXUXUXIXIXIXIXIXLXKXLXLXLXIXIXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXIXIXIXIXKXSXSXSXSXSXAXSXAXAXAXVXAXAXCXAXVXVXVXVXBXBXVXCXBXBXbXbXtXtXtXtXtXtXbXtX7XtXtXeX7XwX7XeXeX7X0XeXeXeX7X2XeX2X2X1X1X1X1X<X3X3X1X>X>X1X3X3X*X1X3X*X>X_.&X*X>X&X*X&X>X>X-X&X&X&X&X'.&X&X'.&X&X@X@X@X@X@X@X&X@X@X'.#X#X$X#X#X&X&X'.&X'.'.sX'.&X'.-X'.,X].'.].'.].'.].,X'.,X'.'.'.].'.,X'.'.'.'.sX].&XsXsX].].].-X,X,X>X>X>X3X3X>X3X1X6X6XeXeXtXrXrXrXuXuXtXtXtXtXtXwXeXtX0XwX0XwX0XwXtXtXwXwX", +"cXcXhXxXxXxXcXhXcXhXhXhXhXcXhXxXhXhXhXhXhXxXhXhXhXhXhXsXhXsXsXhXsXhXhXsXhXsXsXhXsXsX5XsXsXsX,XsX,X,XsX].sXsX,X].].hXsX,X].].dX,XsX,X,X,XsX*X,X].,X,X,X'.*X&X&X*X'.,X,X'.*X'.*X*X&X,X*X,X'.5X*X*X5XjX,X3X3X3X5X5XjX5X5X5X5XjX5XjXkXkXkXnXvXvXMXvXmXMXmXNXNXCXCXCXNXCXCXCXGXCXHXHXHXHXHXHXHXHXKXSXSXKXKXKXUXUXIXIXIXIXLXLXKXLXIXLXIXIXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXIXLXIXSXAXDXAXSXSXAXSXAXAXAXVXAXVXAXAXVXVXVXVXBXBXBXBXBXBXiXuXtXtXtXtXwXtXeXtXtXtXeXwXeXtXeXtXeX7XeXeX7X2X7X2XeX2X2X2X2X2X1X1X1X1X1X1X:X1X1X_.1X3X_.jX1X1X*X,X,X*X*X*X&X,X&X*X&X&X&X-X&X&X&X&X'.&X&X@X&X@X@X'.'.&X'.'.@X'.&X'.&X'.&X'.'.'.&X&X'.&X-X-X-X-X,X'.].'.'.-X-X-X-X'.'.].].&X'.'.'.].sX'.].].sX'.].sX'.'.,X'.*X,X,X,X*X*X,X*X5X5X5XrXuXrXrXuXuXrXtXtXtXtXtXtXeXwXtXeXwX0XwX0X0XwX0XtX", +"cXcXcXxXhXcXxXhXhXhXcXxXcXhXxXhXhXhXhXhXhXhXhXhXhXsXhXhXhXhXhXsXhXsXsXhXsXhXsXsX,XhX[.sXsXsXsXsXsXsXdXdXsX,X'.5X'.sX].5XdX,X'.sX].,X].,X,X].].&X,X'.&X*X].,X,X'.*X&X*X*X,X,X*X'.*X*X*X*X5X'.5X5X3X,X5X3X5XjXjXjX5X5XjXjXkXkXkX5XkXkXkXvXvXvXvXMXMXMXmXNXNXNXCXCXCXCXGXCXCXGXCXHXHXHXHXHXHXHXKXKXKXKXKXKXLXLXKXLXLXLXKXKXLXLXLXIXIXIXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXUXLXIXIXLXSXAXSXSXSXAXSXAXAXVXAXAXVXiXVXVXVXVXiXVXVXVXBXCXiXBXBXtXtXtXtXtXwXwXtXtXeXtX0XwXeXeXeXeX7XeX2X0XeX2X2X2X2X2X2XjX1XeX1X1X1X1X1X1X1X_.jX1X3X_.1X1XjX>X&X,X;X,X*X*X&X;X&X&X&X&X&X&X@X&X&X@X@X'.&X@X@X@X%X@X@X@X&X&X&X'.-X'.&X'.&X&X-X'.-X'.'.'.-X-X'.].-X].,X'.].'.'.'.'.-X'.].'.&X'.].,X].].sX,X'.sX'.,XsX'.sX].'.'.,X,XsX*X*X5X*X*X5X5X5XrXrXuXuXvXtXtXtXtXeXtXwX0X0XwXeX0XeX0XwXwX0X0X" }; |
|
From: Pace W. <pa...@us...> - 2011-06-25 21:21:49
|
Update of /cvsroot/raceintospace/race
In directory vz-cvs-4.sog:/tmp/cvs-serv3650
Modified Files:
make-tarball
Log Message:
change release number for debian ppa
Index: make-tarball
===================================================================
RCS file: /cvsroot/raceintospace/race/make-tarball,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- make-tarball 25 Jun 2011 00:38:37 -0000 1.3
+++ make-tarball 25 Jun 2011 21:21:46 -0000 1.4
@@ -44,6 +44,12 @@
fi
fi
+echo ""
+echo "making: ${outname}"
+echo "note - top of debian/changelog is:"
+head -1 race/debian/changelog
+echo ""
+
rm -rf TMP.build
mkdir TMP.build
|
|
From: Pace W. <pa...@us...> - 2011-06-25 20:47:38
|
Update of /cvsroot/raceintospace/race
In directory vz-cvs-4.sog:/tmp/cvs-serv30225
Modified Files:
put-data
Log Message:
debian install stuff
Index: put-data
===================================================================
RCS file: /cvsroot/raceintospace/race/put-data,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- put-data 25 Jun 2011 16:50:35 -0000 1.1
+++ put-data 25 Jun 2011 20:47:36 -0000 1.2
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/sh -e
# development directory configuration:
#
@@ -38,7 +38,7 @@
if [ -r gamedata/gamedata-files ]
then
echo "installing gamedata from working directory"
- gamedata_dir=.
+ gamedata_dir=gamedata
elif [ -r ../gamedat/gamedata-files ]
then
echo "installing gamedata from ../gamedata"
|
1 message has been excluded from this view by a project administrator.