Menu
▾
▴
sc2-cvs — For automatic cvs notifications only
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(147) |
Oct
(219) |
Nov
(189) |
Dec
(380) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(301) |
Feb
(369) |
Mar
(155) |
Apr
(61) |
May
(77) |
Jun
(101) |
Jul
(191) |
Aug
(107) |
Sep
(180) |
Oct
(37) |
Nov
(7) |
Dec
(28) |
| 2004 |
Jan
(34) |
Feb
(45) |
Mar
(7) |
Apr
(17) |
May
(6) |
Jun
(59) |
Jul
(4) |
Aug
(8) |
Sep
(6) |
Oct
(18) |
Nov
(11) |
Dec
(15) |
| 2005 |
Jan
(148) |
Feb
(146) |
Mar
(73) |
Apr
(154) |
May
(192) |
Jun
(11) |
Jul
(23) |
Aug
(23) |
Sep
(26) |
Oct
(68) |
Nov
(109) |
Dec
(294) |
| 2006 |
Jan
(172) |
Feb
(22) |
Mar
(81) |
Apr
(79) |
May
(83) |
Jun
(23) |
Jul
(35) |
Aug
(66) |
Sep
(39) |
Oct
(133) |
Nov
(125) |
Dec
(90) |
| 2007 |
Jan
(49) |
Feb
(21) |
Mar
(3) |
Apr
(33) |
May
(19) |
Jun
(26) |
Jul
(32) |
Aug
(18) |
Sep
(14) |
Oct
(2) |
Nov
(8) |
Dec
(22) |
| 2008 |
Jan
(23) |
Feb
(14) |
Mar
(28) |
Apr
(11) |
May
(55) |
Jun
(8) |
Jul
(1) |
Aug
(36) |
Sep
(8) |
Oct
(20) |
Nov
(6) |
Dec
|
| 2009 |
Jan
(2) |
Feb
(7) |
Mar
|
Apr
(1) |
May
(2) |
Jun
(46) |
Jul
(15) |
Aug
(1) |
Sep
(3) |
Oct
(88) |
Nov
(108) |
Dec
(119) |
| 2010 |
Jan
(31) |
Feb
(3) |
Mar
(5) |
Apr
(1) |
May
(5) |
Jun
(5) |
Jul
(4) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
(23) |
Mar
(1) |
Apr
(20) |
May
(27) |
Jun
(2) |
Jul
(40) |
Aug
(14) |
Sep
(17) |
Oct
(5) |
Nov
|
Dec
(28) |
| 2012 |
Jan
(31) |
Feb
(19) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
(1) |
Feb
(1) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
|
From: <av...@us...> - 2011-07-20 17:23:49
|
Revision: 3657
http://sc2.svn.sourceforge.net/sc2/?rev=3657&view=rev
Author: avolkov
Date: 2011-07-20 17:23:43 +0000 (Wed, 20 Jul 2011)
Log Message:
-----------
Use correct Commander Hayes phrases when advising the player on the number of landers; bug #1098
Modified Paths:
--------------
trunk/sc2/ChangeLog
trunk/sc2/src/uqm/comm/starbas/starbas.c
Modified: trunk/sc2/ChangeLog
===================================================================
--- trunk/sc2/ChangeLog 2011-07-19 18:34:45 UTC (rev 3656)
+++ trunk/sc2/ChangeLog 2011-07-20 17:23:43 UTC (rev 3657)
@@ -1,4 +1,6 @@
Changes towards version 0.8:
+- Commander Hayes now advises the player correctly on the number of
+ landers one needs (bug #1098) - Alex
- All Sound Options are now preserved between visits to the setup menu.
Some options still require a restart (bug #1132) - Alex
- Removed the remnants of the --music option (bug #1133) - Alex
Modified: trunk/sc2/src/uqm/comm/starbas/starbas.c
===================================================================
--- trunk/sc2/src/uqm/comm/starbas/starbas.c 2011-07-19 18:34:45 UTC (rev 3656)
+++ trunk/sc2/src/uqm/comm/starbas/starbas.c 2011-07-20 17:23:43 UTC (rev 3657)
@@ -677,7 +677,7 @@
if (num_bays < 1)
NPCPhrase (NEED_STORAGE_1);
if (GLOBAL_SIS (NumLanders) == 0)
- NPCPhrase (NEED_LANDERS_1);
+ NPCPhrase (NEED_LANDERS_2);
if (num_batts < 1)
NPCPhrase (NEED_DYNAMOS_1);
@@ -754,7 +754,7 @@
if (GLOBAL_SIS (FuelOnBoard) < FUEL_TANK_CAPACITY * 3)
NPCPhrase (NEED_FUEL_2);
if (GLOBAL_SIS (NumLanders) < 3)
- NPCPhrase (NEED_LANDERS_2);
+ NPCPhrase (NEED_LANDERS_1);
if (num_batts < 4)
NPCPhrase (NEED_DYNAMOS_2);
if (num_defense < 2)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <av...@us...> - 2011-07-19 18:34:55
|
Revision: 3656
http://sc2.svn.sourceforge.net/sc2/?rev=3656&view=rev
Author: avolkov
Date: 2011-07-19 18:34:45 +0000 (Tue, 19 Jul 2011)
Log Message:
-----------
Synchronize resource includes with the master resource list resources.csv
Modified Paths:
--------------
trunk/sc2/build/msvc6/UrQuanMasters.dsp
trunk/sc2/src/uqm/comm/arilou/resinst.h
trunk/sc2/src/uqm/comm/blackur/resinst.h
trunk/sc2/src/uqm/comm/chmmr/resinst.h
trunk/sc2/src/uqm/comm/comandr/resinst.h
trunk/sc2/src/uqm/comm/druuge/resinst.h
trunk/sc2/src/uqm/comm/ilwrath/resinst.h
trunk/sc2/src/uqm/comm/melnorm/resinst.h
trunk/sc2/src/uqm/comm/mycon/resinst.h
trunk/sc2/src/uqm/comm/orz/resinst.h
trunk/sc2/src/uqm/comm/pkunk/resinst.h
trunk/sc2/src/uqm/comm/shofixt/resinst.h
trunk/sc2/src/uqm/comm/slyhome/resinst.h
trunk/sc2/src/uqm/comm/slyland/resinst.h
trunk/sc2/src/uqm/comm/spathi/resinst.h
trunk/sc2/src/uqm/comm/supox/resinst.h
trunk/sc2/src/uqm/comm/syreen/resinst.h
trunk/sc2/src/uqm/comm/talkpet/resinst.h
trunk/sc2/src/uqm/comm/thradd/resinst.h
trunk/sc2/src/uqm/comm/umgah/resinst.h
trunk/sc2/src/uqm/comm/urquan/resinst.h
trunk/sc2/src/uqm/comm/utwig/resinst.h
trunk/sc2/src/uqm/comm/vux/resinst.h
trunk/sc2/src/uqm/comm/yehat/resinst.h
trunk/sc2/src/uqm/comm/zoqfot/resinst.h
trunk/sc2/src/uqm/ships/androsyn/icode.h
trunk/sc2/src/uqm/ships/androsyn/resinst.h
trunk/sc2/src/uqm/ships/arilou/icode.h
trunk/sc2/src/uqm/ships/arilou/resinst.h
trunk/sc2/src/uqm/ships/blackurq/icode.h
trunk/sc2/src/uqm/ships/blackurq/resinst.h
trunk/sc2/src/uqm/ships/chenjesu/icode.h
trunk/sc2/src/uqm/ships/chenjesu/resinst.h
trunk/sc2/src/uqm/ships/chmmr/icode.h
trunk/sc2/src/uqm/ships/chmmr/resinst.h
trunk/sc2/src/uqm/ships/druuge/icode.h
trunk/sc2/src/uqm/ships/druuge/resinst.h
trunk/sc2/src/uqm/ships/human/icode.h
trunk/sc2/src/uqm/ships/human/resinst.h
trunk/sc2/src/uqm/ships/ilwrath/icode.h
trunk/sc2/src/uqm/ships/ilwrath/resinst.h
trunk/sc2/src/uqm/ships/lastbat/icode.h
trunk/sc2/src/uqm/ships/lastbat/resinst.h
trunk/sc2/src/uqm/ships/melnorme/icode.h
trunk/sc2/src/uqm/ships/melnorme/resinst.h
trunk/sc2/src/uqm/ships/mmrnmhrm/icode.h
trunk/sc2/src/uqm/ships/mmrnmhrm/resinst.h
trunk/sc2/src/uqm/ships/mycon/icode.h
trunk/sc2/src/uqm/ships/mycon/resinst.h
trunk/sc2/src/uqm/ships/orz/icode.h
trunk/sc2/src/uqm/ships/orz/resinst.h
trunk/sc2/src/uqm/ships/pkunk/icode.h
trunk/sc2/src/uqm/ships/pkunk/resinst.h
trunk/sc2/src/uqm/ships/probe/icode.h
trunk/sc2/src/uqm/ships/probe/resinst.h
trunk/sc2/src/uqm/ships/shofixti/icode.h
trunk/sc2/src/uqm/ships/shofixti/resinst.h
trunk/sc2/src/uqm/ships/sis_ship/icode.h
trunk/sc2/src/uqm/ships/sis_ship/resinst.h
trunk/sc2/src/uqm/ships/slylandr/icode.h
trunk/sc2/src/uqm/ships/slylandr/resinst.h
trunk/sc2/src/uqm/ships/spathi/icode.h
trunk/sc2/src/uqm/ships/spathi/resinst.h
trunk/sc2/src/uqm/ships/supox/icode.h
trunk/sc2/src/uqm/ships/supox/resinst.h
trunk/sc2/src/uqm/ships/syreen/icode.h
trunk/sc2/src/uqm/ships/syreen/resinst.h
trunk/sc2/src/uqm/ships/thradd/icode.h
trunk/sc2/src/uqm/ships/thradd/resinst.h
trunk/sc2/src/uqm/ships/umgah/icode.h
trunk/sc2/src/uqm/ships/umgah/resinst.h
trunk/sc2/src/uqm/ships/urquan/icode.h
trunk/sc2/src/uqm/ships/urquan/resinst.h
trunk/sc2/src/uqm/ships/utwig/icode.h
trunk/sc2/src/uqm/ships/utwig/resinst.h
trunk/sc2/src/uqm/ships/vux/icode.h
trunk/sc2/src/uqm/ships/vux/resinst.h
trunk/sc2/src/uqm/ships/yehat/icode.h
trunk/sc2/src/uqm/ships/yehat/resinst.h
trunk/sc2/src/uqm/ships/zoqfot/icode.h
trunk/sc2/src/uqm/ships/zoqfot/resinst.h
Modified: trunk/sc2/build/msvc6/UrQuanMasters.dsp
===================================================================
--- trunk/sc2/build/msvc6/UrQuanMasters.dsp 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/build/msvc6/UrQuanMasters.dsp 2011-07-19 18:34:45 UTC (rev 3656)
@@ -3118,6 +3118,10 @@
# End Source File
# Begin Source File
+SOURCE=..\..\src\uqm\corecode.h
+# End Source File
+# Begin Source File
+
SOURCE=..\..\src\uqm\credits.c
# End Source File
# Begin Source File
Modified: trunk/sc2/src/uqm/comm/arilou/resinst.h
===================================================================
--- trunk/sc2/src/uqm/comm/arilou/resinst.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/comm/arilou/resinst.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1,5 +1,9 @@
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define ARILOU_COLOR_MAP "comm.arilou.colortable"
-#define ARILOU_PMAP_ANIM "comm.arilou.graphics"
+#define ARILOU_CONVERSATION_PHRASES "comm.arilou.dialogue"
#define ARILOU_FONT "comm.arilou.font"
-#define ARILOU_CONVERSATION_PHRASES "comm.arilou.dialogue"
#define ARILOU_MUSIC "comm.arilou.music"
+#define ARILOU_PMAP_ANIM "comm.arilou.graphics"
Modified: trunk/sc2/src/uqm/comm/blackur/resinst.h
===================================================================
--- trunk/sc2/src/uqm/comm/blackur/resinst.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/comm/blackur/resinst.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1,5 +1,9 @@
-#define BLACKURQ_PMAP_ANIM "comm.kohrah.graphics"
-#define BLACKURQ_FONT "comm.kohrah.font"
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define BLACKURQ_COLOR_MAP "comm.kohrah.colortable"
#define BLACKURQ_CONVERSATION_PHRASES "comm.kohrah.dialogue"
+#define BLACKURQ_FONT "comm.kohrah.font"
#define BLACKURQ_MUSIC "comm.kohrah.music"
+#define BLACKURQ_PMAP_ANIM "comm.kohrah.graphics"
Modified: trunk/sc2/src/uqm/comm/chmmr/resinst.h
===================================================================
--- trunk/sc2/src/uqm/comm/chmmr/resinst.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/comm/chmmr/resinst.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1,5 +1,9 @@
-#define CHMMR_PMAP_ANIM "comm.chmmr.graphics"
-#define CHMMR_FONT "comm.chmmr.font"
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define CHMMR_COLOR_MAP "comm.chmmr.colortable"
#define CHMMR_CONVERSATION_PHRASES "comm.chmmr.dialogue"
+#define CHMMR_FONT "comm.chmmr.font"
#define CHMMR_MUSIC "comm.chmmr.music"
+#define CHMMR_PMAP_ANIM "comm.chmmr.graphics"
Modified: trunk/sc2/src/uqm/comm/comandr/resinst.h
===================================================================
--- trunk/sc2/src/uqm/comm/comandr/resinst.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/comm/comandr/resinst.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1,8 +1,12 @@
-#define COMMANDER_PMAP_ANIM "comm.commander.graphics"
-#define COMMANDER_FONT "comm.commander.font"
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define COMMANDER_COLOR_MAP "comm.commander.colortable"
#define COMMANDER_CONVERSATION_PHRASES "comm.commander.dialogue"
-#define STARBASE_CONVERSATION_PHRASES "comm.starbase.dialogue"
+#define COMMANDER_FONT "comm.commander.font"
#define COMMANDER_LOWPOW_MUSIC "comm.commander.lowpower.music"
#define COMMANDER_MUSIC "comm.commander.music"
+#define COMMANDER_PMAP_ANIM "comm.commander.graphics"
#define STARBASE_ALT_MUSIC "comm.starbase.music"
+#define STARBASE_CONVERSATION_PHRASES "comm.starbase.dialogue"
Modified: trunk/sc2/src/uqm/comm/druuge/resinst.h
===================================================================
--- trunk/sc2/src/uqm/comm/druuge/resinst.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/comm/druuge/resinst.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1,5 +1,9 @@
-#define DRUUGE_PMAP_ANIM "comm.druuge.graphics"
-#define DRUUGE_FONT "comm.druuge.font"
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define DRUUGE_COLOR_MAP "comm.druuge.colortable"
#define DRUUGE_CONVERSATION_PHRASES "comm.druuge.dialogue"
+#define DRUUGE_FONT "comm.druuge.font"
#define DRUUGE_MUSIC "comm.druuge.music"
+#define DRUUGE_PMAP_ANIM "comm.druuge.graphics"
Modified: trunk/sc2/src/uqm/comm/ilwrath/resinst.h
===================================================================
--- trunk/sc2/src/uqm/comm/ilwrath/resinst.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/comm/ilwrath/resinst.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1,5 +1,9 @@
-#define ILWRATH_PMAP_ANIM "comm.ilwrath.graphics"
-#define ILWRATH_FONT "comm.ilwrath.font"
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define ILWRATH_COLOR_MAP "comm.ilwrath.colortable"
#define ILWRATH_CONVERSATION_PHRASES "comm.ilwrath.dialogue"
+#define ILWRATH_FONT "comm.ilwrath.font"
#define ILWRATH_MUSIC "comm.ilwrath.music"
+#define ILWRATH_PMAP_ANIM "comm.ilwrath.graphics"
Modified: trunk/sc2/src/uqm/comm/melnorm/resinst.h
===================================================================
--- trunk/sc2/src/uqm/comm/melnorm/resinst.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/comm/melnorm/resinst.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1,5 +1,9 @@
-#define MELNORME_PMAP_ANIM "comm.melnorme.graphics"
-#define MELNORME_FONT "comm.melnorme.font"
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define MELNORME_COLOR_MAP "comm.melnorme.colortable"
#define MELNORME_CONVERSATION_PHRASES "comm.melnorme.dialogue"
+#define MELNORME_FONT "comm.melnorme.font"
#define MELNORME_MUSIC "comm.melnorme.music"
+#define MELNORME_PMAP_ANIM "comm.melnorme.graphics"
Modified: trunk/sc2/src/uqm/comm/mycon/resinst.h
===================================================================
--- trunk/sc2/src/uqm/comm/mycon/resinst.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/comm/mycon/resinst.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1,5 +1,9 @@
-#define MYCON_PMAP_ANIM "comm.mycon.graphics"
-#define MYCON_FONT "comm.mycon.font"
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define MYCON_COLOR_MAP "comm.mycon.colortable"
#define MYCON_CONVERSATION_PHRASES "comm.mycon.dialogue"
+#define MYCON_FONT "comm.mycon.font"
#define MYCON_MUSIC "comm.mycon.music"
+#define MYCON_PMAP_ANIM "comm.mycon.graphics"
Modified: trunk/sc2/src/uqm/comm/orz/resinst.h
===================================================================
--- trunk/sc2/src/uqm/comm/orz/resinst.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/comm/orz/resinst.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1,5 +1,9 @@
-#define ORZ_PMAP_ANIM "comm.orz.graphics"
-#define ORZ_FONT "comm.orz.font"
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define ORZ_COLOR_MAP "comm.orz.colortable"
#define ORZ_CONVERSATION_PHRASES "comm.orz.dialogue"
+#define ORZ_FONT "comm.orz.font"
#define ORZ_MUSIC "comm.orz.music"
+#define ORZ_PMAP_ANIM "comm.orz.graphics"
Modified: trunk/sc2/src/uqm/comm/pkunk/resinst.h
===================================================================
--- trunk/sc2/src/uqm/comm/pkunk/resinst.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/comm/pkunk/resinst.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1,5 +1,9 @@
-#define PKUNK_PMAP_ANIM "comm.pkunk.graphics"
-#define PKUNK_FONT "comm.pkunk.font"
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define PKUNK_COLOR_MAP "comm.pkunk.colortable"
#define PKUNK_CONVERSATION_PHRASES "comm.pkunk.dialogue"
+#define PKUNK_FONT "comm.pkunk.font"
#define PKUNK_MUSIC "comm.pkunk.music"
+#define PKUNK_PMAP_ANIM "comm.pkunk.graphics"
Modified: trunk/sc2/src/uqm/comm/shofixt/resinst.h
===================================================================
--- trunk/sc2/src/uqm/comm/shofixt/resinst.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/comm/shofixt/resinst.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1,5 +1,9 @@
-#define SHOFIXTI_PMAP_ANIM "comm.shofixti.graphics"
-#define SHOFIXTI_FONT "comm.shofixti.font"
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define SHOFIXTI_COLOR_MAP "comm.shofixti.colortable"
#define SHOFIXTI_CONVERSATION_PHRASES "comm.shofixti.dialogue"
+#define SHOFIXTI_FONT "comm.shofixti.font"
#define SHOFIXTI_MUSIC "comm.shofixti.music"
+#define SHOFIXTI_PMAP_ANIM "comm.shofixti.graphics"
Modified: trunk/sc2/src/uqm/comm/slyhome/resinst.h
===================================================================
--- trunk/sc2/src/uqm/comm/slyhome/resinst.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/comm/slyhome/resinst.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1,5 +1,9 @@
-#define SLYLANDRO_PMAP_ANIM "comm.slylandro.graphics"
-#define SLYLANDRO_FONT "comm.slylandro.font"
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define SLYLANDRO_COLOR_MAP "comm.slylandro.colortable"
#define SLYLANDRO_CONVERSATION_PHRASES "comm.slylandro.dialogue"
+#define SLYLANDRO_FONT "comm.slylandro.font"
#define SLYLANDRO_MUSIC "comm.slylandro.music"
+#define SLYLANDRO_PMAP_ANIM "comm.slylandro.graphics"
Modified: trunk/sc2/src/uqm/comm/slyland/resinst.h
===================================================================
--- trunk/sc2/src/uqm/comm/slyland/resinst.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/comm/slyland/resinst.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1,5 +1,9 @@
-#define SLYLAND_PMAP_ANIM "comm.probe.graphics"
-#define SLYLAND_FONT "comm.probe.font"
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define SLYLAND_COLOR_MAP "comm.probe.colortable"
#define SLYLAND_CONVERSATION_PHRASES "comm.probe.dialogue"
+#define SLYLAND_FONT "comm.probe.font"
#define SLYLAND_MUSIC "comm.probe.music"
+#define SLYLAND_PMAP_ANIM "comm.probe.graphics"
Modified: trunk/sc2/src/uqm/comm/spathi/resinst.h
===================================================================
--- trunk/sc2/src/uqm/comm/spathi/resinst.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/comm/spathi/resinst.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1,10 +1,14 @@
-#define SPATHI_HOME_PMAP_ANIM "comm.safeones.graphics"
-#define SPATHI_PMAP_ANIM "comm.spathi.graphics"
-#define SPATHI_FONT "comm.spathi.font"
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
+#define FWIFFO_MUSIC "comm.fwiffo.music"
+#define SPAHOME_MUSIC "comm.safeones.music"
#define SPATHI_COLOR_MAP "comm.spathi.colortable"
#define SPATHI_CONVERSATION_PHRASES "comm.spathi.dialogue"
+#define SPATHI_FONT "comm.spathi.font"
#define SPATHI_HOME_COLOR_MAP "comm.safeones.colortable"
#define SPATHI_HOME_CONVERSATION_PHRASES "comm.safeones.dialogue"
-#define FWIFFO_MUSIC "comm.fwiffo.music"
-#define SPAHOME_MUSIC "comm.safeones.music"
+#define SPATHI_HOME_PMAP_ANIM "comm.safeones.graphics"
#define SPATHI_MUSIC "comm.spathi.music"
+#define SPATHI_PMAP_ANIM "comm.spathi.graphics"
Modified: trunk/sc2/src/uqm/comm/supox/resinst.h
===================================================================
--- trunk/sc2/src/uqm/comm/supox/resinst.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/comm/supox/resinst.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1,5 +1,9 @@
-#define SUPOX_PMAP_ANIM "comm.supox.graphics"
-#define SUPOX_FONT "comm.supox.font"
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define SUPOX_COLOR_MAP "comm.supox.colortable"
#define SUPOX_CONVERSATION_PHRASES "comm.supox.dialogue"
+#define SUPOX_FONT "comm.supox.font"
#define SUPOX_MUSIC "comm.supox.music"
+#define SUPOX_PMAP_ANIM "comm.supox.graphics"
Modified: trunk/sc2/src/uqm/comm/syreen/resinst.h
===================================================================
--- trunk/sc2/src/uqm/comm/syreen/resinst.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/comm/syreen/resinst.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1,5 +1,9 @@
-#define SYREEN_PMAP_ANIM "comm.syreen.graphics"
-#define SYREEN_FONT "comm.syreen.font"
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define SYREEN_COLOR_MAP "comm.syreen.colortable"
#define SYREEN_CONVERSATION_PHRASES "comm.syreen.dialogue"
+#define SYREEN_FONT "comm.syreen.font"
#define SYREEN_MUSIC "comm.syreen.music"
+#define SYREEN_PMAP_ANIM "comm.syreen.graphics"
Modified: trunk/sc2/src/uqm/comm/talkpet/resinst.h
===================================================================
--- trunk/sc2/src/uqm/comm/talkpet/resinst.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/comm/talkpet/resinst.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1,5 +1,9 @@
-#define TALKING_PET_PMAP_ANIM "comm.talkingpet.graphics"
-#define TALKING_PET_FONT "comm.talkingpet.font"
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define TALKING_PET_COLOR_MAP "comm.talkingpet.colortable"
#define TALKING_PET_CONVERSATION_PHRASES "comm.talkingpet.dialogue"
+#define TALKING_PET_FONT "comm.talkingpet.font"
#define TALKING_PET_MUSIC "comm.talkingpet.music"
+#define TALKING_PET_PMAP_ANIM "comm.talkingpet.graphics"
Modified: trunk/sc2/src/uqm/comm/thradd/resinst.h
===================================================================
--- trunk/sc2/src/uqm/comm/thradd/resinst.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/comm/thradd/resinst.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1,5 +1,9 @@
-#define THRADD_PMAP_ANIM "comm.thraddash.graphics"
-#define THRADD_FONT "comm.thraddash.font"
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define THRADD_COLOR_MAP "comm.thraddash.colortable"
#define THRADD_CONVERSATION_PHRASES "comm.thraddash.dialogue"
+#define THRADD_FONT "comm.thraddash.font"
#define THRADD_MUSIC "comm.thraddash.music"
+#define THRADD_PMAP_ANIM "comm.thraddash.graphics"
Modified: trunk/sc2/src/uqm/comm/umgah/resinst.h
===================================================================
--- trunk/sc2/src/uqm/comm/umgah/resinst.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/comm/umgah/resinst.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1,5 +1,9 @@
-#define UMGAH_PMAP_ANIM "comm.umgah.graphics"
-#define UMGAH_FONT "comm.umgah.font"
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define UMGAH_COLOR_MAP "comm.umgah.colortable"
#define UMGAH_CONVERSATION_PHRASES "comm.umgah.dialogue"
+#define UMGAH_FONT "comm.umgah.font"
#define UMGAH_MUSIC "comm.umgah.music"
+#define UMGAH_PMAP_ANIM "comm.umgah.graphics"
Modified: trunk/sc2/src/uqm/comm/urquan/resinst.h
===================================================================
--- trunk/sc2/src/uqm/comm/urquan/resinst.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/comm/urquan/resinst.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1,5 +1,9 @@
-#define URQUAN_PMAP_ANIM "comm.urquan.graphics"
-#define URQUAN_FONT "comm.urquan.font"
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define URQUAN_COLOR_MAP "comm.urquan.colortable"
#define URQUAN_CONVERSATION_PHRASES "comm.urquan.dialogue"
+#define URQUAN_FONT "comm.urquan.font"
#define URQUAN_MUSIC "comm.urquan.music"
+#define URQUAN_PMAP_ANIM "comm.urquan.graphics"
Modified: trunk/sc2/src/uqm/comm/utwig/resinst.h
===================================================================
--- trunk/sc2/src/uqm/comm/utwig/resinst.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/comm/utwig/resinst.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1,6 +1,10 @@
-#define UTWIG_PMAP_ANIM "comm.utwig.graphics"
-#define UTWIG_FONT "comm.utwig.font"
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define UTWIG_COLOR_MAP "comm.utwig.colortable"
#define UTWIG_CONVERSATION_PHRASES "comm.utwig.dialogue"
+#define UTWIG_FONT "comm.utwig.font"
#define UTWIG_MUSIC "comm.utwig.music"
+#define UTWIG_PMAP_ANIM "comm.utwig.graphics"
#define UTWIG_ULTRON_MUSIC "comm.utwig.ultron.music"
Modified: trunk/sc2/src/uqm/comm/vux/resinst.h
===================================================================
--- trunk/sc2/src/uqm/comm/vux/resinst.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/comm/vux/resinst.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1,5 +1,9 @@
-#define VUX_PMAP_ANIM "comm.vux.graphics"
-#define VUX_FONT "comm.vux.font"
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define VUX_COLOR_MAP "comm.vux.colortable"
#define VUX_CONVERSATION_PHRASES "comm.vux.dialogue"
+#define VUX_FONT "comm.vux.font"
#define VUX_MUSIC "comm.vux.music"
+#define VUX_PMAP_ANIM "comm.vux.graphics"
Modified: trunk/sc2/src/uqm/comm/yehat/resinst.h
===================================================================
--- trunk/sc2/src/uqm/comm/yehat/resinst.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/comm/yehat/resinst.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1,7 +1,11 @@
-#define YEHAT_PMAP_ANIM "comm.yehat.graphics"
-#define YEHAT_FONT "comm.yehat.font"
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define REBEL_CONVERSATION_PHRASES "comm.yehat.rebel.dialogue"
+#define REBEL_MUSIC "comm.yehat.rebel.music"
#define YEHAT_COLOR_MAP "comm.yehat.colortable"
#define YEHAT_CONVERSATION_PHRASES "comm.yehat.dialogue"
-#define REBEL_MUSIC "comm.yehat.rebel.music"
+#define YEHAT_FONT "comm.yehat.font"
#define YEHAT_MUSIC "comm.yehat.music"
+#define YEHAT_PMAP_ANIM "comm.yehat.graphics"
Modified: trunk/sc2/src/uqm/comm/zoqfot/resinst.h
===================================================================
--- trunk/sc2/src/uqm/comm/zoqfot/resinst.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/comm/zoqfot/resinst.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1,5 +1,9 @@
-#define ZOQFOTPIK_PMAP_ANIM "comm.zoqfotpik.graphics"
-#define ZOQFOTPIK_FONT "comm.zoqfotpik.font"
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define ZOQFOTPIK_COLOR_MAP "comm.zoqfotpik.colortable"
#define ZOQFOTPIK_CONVERSATION_PHRASES "comm.zoqfotpik.dialogue"
+#define ZOQFOTPIK_FONT "comm.zoqfotpik.font"
#define ZOQFOTPIK_MUSIC "comm.zoqfotpik.music"
+#define ZOQFOTPIK_PMAP_ANIM "comm.zoqfotpik.graphics"
Modified: trunk/sc2/src/uqm/ships/androsyn/icode.h
===================================================================
--- trunk/sc2/src/uqm/ships/androsyn/icode.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/ships/androsyn/icode.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1 +1,5 @@
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define ANDROSYNTH_CODE "ship.androsynth.code"
Modified: trunk/sc2/src/uqm/ships/androsyn/resinst.h
===================================================================
--- trunk/sc2/src/uqm/ships/androsyn/resinst.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/ships/androsyn/resinst.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1,3 +1,7 @@
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define ANDROSYNTH_BIG_MASK_PMAP_ANIM "ship.androsynth.graphics.guardian.large"
#define ANDROSYNTH_CAPT_MASK_PMAP_ANIM "ship.androsynth.graphics.captain"
#define ANDROSYNTH_ICON_MASK_PMAP_ANIM "ship.androsynth.icons"
@@ -3,5 +7,8 @@
#define ANDROSYNTH_MED_MASK_PMAP_ANIM "ship.androsynth.graphics.guardian.medium"
#define ANDROSYNTH_MICON_MASK_PMAP_ANIM "ship.androsynth.meleeicons"
+#define ANDROSYNTH_RACE_STRINGS "ship.androsynth.text"
+#define ANDROSYNTH_SHIP_SOUNDS "ship.androsynth.sounds"
#define ANDROSYNTH_SML_MASK_PMAP_ANIM "ship.androsynth.graphics.guardian.small"
+#define ANDROSYNTH_VICTORY_SONG "ship.androsynth.ditty"
#define BLAZER_BIG_MASK_PMAP_ANIM "ship.androsynth.graphics.blazer.large"
#define BLAZER_MED_MASK_PMAP_ANIM "ship.androsynth.graphics.blazer.medium"
@@ -10,8 +17,3 @@
#define BUBBLE_BIG_MASK_PMAP_ANIM "ship.androsynth.graphics.bubble.large"
#define BUBBLE_MED_MASK_PMAP_ANIM "ship.androsynth.graphics.bubble.medium"
#define BUBBLE_SML_MASK_PMAP_ANIM "ship.androsynth.graphics.bubble.small"
-#define ANDROSYNTH_RACE_STRINGS "ship.androsynth.text"
-#define ANDROSYNTH_SHIP_SOUNDS "ship.androsynth.sounds"
-#define ANDROSYNTH_VICTORY_SONG "ship.androsynth.ditty"
-
-#include "icode.h"
Modified: trunk/sc2/src/uqm/ships/arilou/icode.h
===================================================================
--- trunk/sc2/src/uqm/ships/arilou/icode.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/ships/arilou/icode.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1 +1,5 @@
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define ARILOU_CODE "ship.arilou.code"
Modified: trunk/sc2/src/uqm/ships/arilou/resinst.h
===================================================================
--- trunk/sc2/src/uqm/ships/arilou/resinst.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/ships/arilou/resinst.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1,3 +1,7 @@
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define ARILOU_BIG_MASK_PMAP_ANIM "ship.arilou.graphics.skiff.large"
#define ARILOU_CAPTAIN_MASK_PMAP_ANIM "ship.arilou.graphics.captain"
#define ARILOU_ICON_MASK_PMAP_ANIM "ship.arilou.icons"
@@ -3,11 +7,9 @@
#define ARILOU_MED_MASK_PMAP_ANIM "ship.arilou.graphics.skiff.medium"
#define ARILOU_MICON_MASK_PMAP_ANIM "ship.arilou.meleeicons"
+#define ARILOU_RACE_STRINGS "ship.arilou.text"
+#define ARILOU_SHIP_SOUNDS "ship.arilou.sounds"
#define ARILOU_SML_MASK_PMAP_ANIM "ship.arilou.graphics.skiff.small"
+#define ARILOU_VICTORY_SONG "ship.arilou.ditty"
#define WARP_BIG_MASK_PMAP_ANIM "ship.arilou.graphics.warp.large"
#define WARP_MED_MASK_PMAP_ANIM "ship.arilou.graphics.warp.medium"
#define WARP_SML_MASK_PMAP_ANIM "ship.arilou.graphics.warp.small"
-#define ARILOU_RACE_STRINGS "ship.arilou.text"
-#define ARILOU_SHIP_SOUNDS "ship.arilou.sounds"
-#define ARILOU_VICTORY_SONG "ship.arilou.ditty"
-
-#include "icode.h"
Modified: trunk/sc2/src/uqm/ships/blackurq/icode.h
===================================================================
--- trunk/sc2/src/uqm/ships/blackurq/icode.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/ships/blackurq/icode.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1 +1,5 @@
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define KOHR_AH_CODE "ship.kohrah.code"
Modified: trunk/sc2/src/uqm/ships/blackurq/resinst.h
===================================================================
--- trunk/sc2/src/uqm/ships/blackurq/resinst.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/ships/blackurq/resinst.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1,3 +1,7 @@
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define BUZZSAW_BIG_MASK_PMAP_ANIM "ship.kohrah.graphics.buzzsaw.large"
#define BUZZSAW_MED_MASK_PMAP_ANIM "ship.kohrah.graphics.buzzsaw.medium"
#define BUZZSAW_SML_MASK_PMAP_ANIM "ship.kohrah.graphics.buzzsaw.small"
@@ -9,9 +13,7 @@
#define KOHR_AH_ICON_MASK_PMAP_ANIM "ship.kohrah.icons"
#define KOHR_AH_MED_MASK_PMAP_ANIM "ship.kohrah.graphics.marauder.medium"
#define KOHR_AH_MICON_MASK_PMAP_ANIM "ship.kohrah.meleeicons"
-#define KOHR_AH_SML_MASK_PMAP_ANIM "ship.kohrah.graphics.marauder.small"
#define KOHR_AH_RACE_STRINGS "ship.kohrah.text"
#define KOHR_AH_SHIP_SOUNDS "ship.kohrah.sounds"
+#define KOHR_AH_SML_MASK_PMAP_ANIM "ship.kohrah.graphics.marauder.small"
#define KOHR_AH_VICTORY_SONG "ship.kohrah.ditty"
-
-#include "icode.h"
Modified: trunk/sc2/src/uqm/ships/chenjesu/icode.h
===================================================================
--- trunk/sc2/src/uqm/ships/chenjesu/icode.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/ships/chenjesu/icode.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1 +1,5 @@
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define CHENJESU_CODE "ship.chenjesu.code"
Modified: trunk/sc2/src/uqm/ships/chenjesu/resinst.h
===================================================================
--- trunk/sc2/src/uqm/ships/chenjesu/resinst.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/ships/chenjesu/resinst.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1,3 +1,7 @@
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define CHENJESU_BIG_MASK_PMAP_ANIM "ship.chenjesu.graphics.broodhome.large"
#define CHENJESU_CAPTAIN_MASK_PMAP_ANIM "ship.chenjesu.graphics.captain"
#define CHENJESU_ICON_MASK_PMAP_ANIM "ship.chenjesu.icons"
@@ -3,5 +7,8 @@
#define CHENJESU_MED_MASK_PMAP_ANIM "ship.chenjesu.graphics.broodhome.medium"
#define CHENJESU_MICON_MASK_PMAP_ANIM "ship.chenjesu.meleeicons"
+#define CHENJESU_RACE_STRINGS "ship.chenjesu.text"
+#define CHENJESU_SHIP_SOUNDS "ship.chenjesu.sounds"
#define CHENJESU_SML_MASK_PMAP_ANIM "ship.chenjesu.graphics.broodhome.small"
+#define CHENJESU_VICTORY_SONG "ship.chenjesu.ditty"
#define DOGGY_BIG_MASK_PMAP_ANIM "ship.chenjesu.graphics.doggy.large"
#define DOGGY_MED_MASK_PMAP_ANIM "ship.chenjesu.graphics.doggy.medium"
@@ -10,8 +17,3 @@
#define SPARK_BIG_MASK_PMAP_ANIM "ship.chenjesu.graphics.spark.large"
#define SPARK_MED_MASK_PMAP_ANIM "ship.chenjesu.graphics.spark.medium"
#define SPARK_SML_MASK_PMAP_ANIM "ship.chenjesu.graphics.spark.small"
-#define CHENJESU_RACE_STRINGS "ship.chenjesu.text"
-#define CHENJESU_SHIP_SOUNDS "ship.chenjesu.sounds"
-#define CHENJESU_VICTORY_SONG "ship.chenjesu.ditty"
-
-#include "icode.h"
Modified: trunk/sc2/src/uqm/ships/chmmr/icode.h
===================================================================
--- trunk/sc2/src/uqm/ships/chmmr/icode.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/ships/chmmr/icode.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1 +1,5 @@
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define CHMMR_CODE "ship.chmmr.code"
Modified: trunk/sc2/src/uqm/ships/chmmr/resinst.h
===================================================================
--- trunk/sc2/src/uqm/ships/chmmr/resinst.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/ships/chmmr/resinst.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1,3 +1,7 @@
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define CHMMR_BIG_MASK_PMAP_ANIM "ship.chmmr.graphics.avatar.large"
#define CHMMR_CAPTAIN_MASK_PMAP_ANIM "ship.chmmr.graphics.captain"
#define CHMMR_ICON_MASK_PMAP_ANIM "ship.chmmr.icons"
@@ -3,5 +7,8 @@
#define CHMMR_MED_MASK_PMAP_ANIM "ship.chmmr.graphics.avatar.medium"
#define CHMMR_MICON_MASK_PMAP_ANIM "ship.chmmr.meleeicons"
+#define CHMMR_RACE_STRINGS "ship.chmmr.text"
+#define CHMMR_SHIP_SOUNDS "ship.chmmr.sounds"
#define CHMMR_SML_MASK_PMAP_ANIM "ship.chmmr.graphics.avatar.small"
+#define CHMMR_VICTORY_SONG "ship.chmmr.ditty"
#define MUZZLE_BIG_MASK_PMAP_ANIM "ship.chmmr.graphics.muzzle.large"
#define MUZZLE_MED_MASK_PMAP_ANIM "ship.chmmr.graphics.muzzle.medium"
@@ -10,8 +17,3 @@
#define SATELLITE_BIG_MASK_PMAP_ANIM "ship.chmmr.graphics.satellite.large"
#define SATELLITE_MED_MASK_PMAP_ANIM "ship.chmmr.graphics.satellite.medium"
#define SATELLITE_SML_MASK_PMAP_ANIM "ship.chmmr.graphics.satellite.small"
-#define CHMMR_RACE_STRINGS "ship.chmmr.text"
-#define CHMMR_SHIP_SOUNDS "ship.chmmr.sounds"
-#define CHMMR_VICTORY_SONG "ship.chmmr.ditty"
-
-#include "icode.h"
Modified: trunk/sc2/src/uqm/ships/druuge/icode.h
===================================================================
--- trunk/sc2/src/uqm/ships/druuge/icode.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/ships/druuge/icode.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1 +1,5 @@
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define DRUUGE_CODE "ship.druuge.code"
Modified: trunk/sc2/src/uqm/ships/druuge/resinst.h
===================================================================
--- trunk/sc2/src/uqm/ships/druuge/resinst.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/ships/druuge/resinst.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1,3 +1,7 @@
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define DRUUGE_BIG_MASK_PMAP_ANIM "ship.druuge.graphics.mauler.large"
#define DRUUGE_CANNON_BIG_MASK_PMAP_ANIM "ship.druuge.graphics.cannon.large"
#define DRUUGE_CANNON_MED_MASK_PMAP_ANIM "ship.druuge.graphics.cannon.medium"
@@ -6,9 +10,7 @@
#define DRUUGE_ICON_MASK_PMAP_ANIM "ship.druuge.icons"
#define DRUUGE_MED_MASK_PMAP_ANIM "ship.druuge.graphics.mauler.medium"
#define DRUUGE_MICON_MASK_PMAP_ANIM "ship.druuge.meleeicons"
-#define DRUUGE_SML_MASK_PMAP_ANIM "ship.druuge.graphics.mauler.small"
#define DRUUGE_RACE_STRINGS "ship.druuge.text"
#define DRUUGE_SHIP_SOUNDS "ship.druuge.sounds"
+#define DRUUGE_SML_MASK_PMAP_ANIM "ship.druuge.graphics.mauler.small"
#define DRUUGE_VICTORY_SONG "ship.druuge.ditty"
-
-#include "icode.h"
Modified: trunk/sc2/src/uqm/ships/human/icode.h
===================================================================
--- trunk/sc2/src/uqm/ships/human/icode.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/ships/human/icode.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1 +1,5 @@
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define HUMAN_CODE "ship.earthling.code"
Modified: trunk/sc2/src/uqm/ships/human/resinst.h
===================================================================
--- trunk/sc2/src/uqm/ships/human/resinst.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/ships/human/resinst.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1,3 +1,7 @@
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define HUMAN_BIG_MASK_PMAP_ANIM "ship.earthling.graphics.human.large"
#define HUMAN_CAPTAIN_MASK_PMAP_ANIM "ship.earthling.graphics.captain"
#define HUMAN_ICON_MASK_PMAP_ANIM "ship.earthling.icons"
@@ -3,11 +7,9 @@
#define HUMAN_MED_MASK_PMAP_ANIM "ship.earthling.graphics.human.medium"
#define HUMAN_MICON_MASK_PMAP_ANIM "ship.earthling.meleeicons"
+#define HUMAN_RACE_STRINGS "ship.earthling.text"
+#define HUMAN_SHIP_SOUNDS "ship.earthling.sounds"
#define HUMAN_SML_MASK_PMAP_ANIM "ship.earthling.graphics.human.small"
+#define HUMAN_VICTORY_SONG "ship.earthling.ditty"
#define SATURN_BIG_MASK_PMAP_ANIM "ship.earthling.graphics.saturn.large"
#define SATURN_MED_MASK_PMAP_ANIM "ship.earthling.graphics.saturn.medium"
#define SATURN_SML_MASK_PMAP_ANIM "ship.earthling.graphics.saturn.small"
-#define HUMAN_RACE_STRINGS "ship.earthling.text"
-#define HUMAN_SHIP_SOUNDS "ship.earthling.sounds"
-#define HUMAN_VICTORY_SONG "ship.earthling.ditty"
-
-#include "icode.h"
Modified: trunk/sc2/src/uqm/ships/ilwrath/icode.h
===================================================================
--- trunk/sc2/src/uqm/ships/ilwrath/icode.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/ships/ilwrath/icode.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1 +1,5 @@
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define ILWRATH_CODE "ship.ilwrath.code"
Modified: trunk/sc2/src/uqm/ships/ilwrath/resinst.h
===================================================================
--- trunk/sc2/src/uqm/ships/ilwrath/resinst.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/ships/ilwrath/resinst.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1,3 +1,7 @@
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define FIRE_BIG_MASK_PMAP_ANIM "ship.ilwrath.graphics.fire.large"
#define FIRE_MED_MASK_PMAP_ANIM "ship.ilwrath.graphics.fire.medium"
#define FIRE_SML_MASK_PMAP_ANIM "ship.ilwrath.graphics.fire.small"
@@ -6,9 +10,7 @@
#define ILWRATH_ICON_MASK_PMAP_ANIM "ship.ilwrath.icons"
#define ILWRATH_MED_MASK_PMAP_ANIM "ship.ilwrath.graphics.avenger.medium"
#define ILWRATH_MICON_MASK_PMAP_ANIM "ship.ilwrath.meleeicons"
-#define ILWRATH_SML_MASK_PMAP_ANIM "ship.ilwrath.graphics.avenger.small"
#define ILWRATH_RACE_STRINGS "ship.ilwrath.text"
#define ILWRATH_SHIP_SOUNDS "ship.ilwrath.sounds"
+#define ILWRATH_SML_MASK_PMAP_ANIM "ship.ilwrath.graphics.avenger.small"
#define ILWRATH_VICTORY_SONG "ship.ilwrath.ditty"
-
-#include "icode.h"
Modified: trunk/sc2/src/uqm/ships/lastbat/icode.h
===================================================================
--- trunk/sc2/src/uqm/ships/lastbat/icode.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/ships/lastbat/icode.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1 +1,5 @@
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define SAMATRA_CODE "ship.samatra.code"
Modified: trunk/sc2/src/uqm/ships/lastbat/resinst.h
===================================================================
--- trunk/sc2/src/uqm/ships/lastbat/resinst.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/ships/lastbat/resinst.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1,3 +1,7 @@
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define GENERATOR_BIG_MASK_ANIM "ship.samatra.graphics.generator.large"
#define GENERATOR_MED_MASK_PMAP_ANIM "ship.samatra.graphics.generator.medium"
#define GENERATOR_SML_MASK_PMAP_ANIM "ship.samatra.graphics.generator.small"
@@ -4,11 +8,9 @@
#define SAMATRA_BIG_MASK_ANIM "ship.samatra.graphics.samatra.large"
#define SAMATRA_CAPTAIN_MASK_PMAP_ANIM "ship.samatra.graphics.captain"
#define SAMATRA_MED_MASK_PMAP_ANIM "ship.samatra.graphics.samatra.medium"
+#define SAMATRA_SHIP_SOUNDS "ship.samatra.sounds"
#define SAMATRA_SML_MASK_PMAP_ANIM "ship.samatra.graphics.samatra.small"
+#define SAMATRA_VICTORY_SONG "ship.samatra.ditty"
#define SENTINEL_BIG_MASK_ANIM "ship.samatra.graphics.sentinel.large"
#define SENTINEL_MED_MASK_PMAP_ANIM "ship.samatra.graphics.sentinel.medium"
#define SENTINEL_SML_MASK_PMAP_ANIM "ship.samatra.graphics.sentinel.small"
-#define SAMATRA_SHIP_SOUNDS "ship.samatra.sounds"
-#define SAMATRA_VICTORY_SONG "ship.samatra.ditty"
-
-#include "icode.h"
Modified: trunk/sc2/src/uqm/ships/melnorme/icode.h
===================================================================
--- trunk/sc2/src/uqm/ships/melnorme/icode.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/ships/melnorme/icode.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1 +1,5 @@
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define MELNORME_CODE "ship.melnorme.code"
Modified: trunk/sc2/src/uqm/ships/melnorme/resinst.h
===================================================================
--- trunk/sc2/src/uqm/ships/melnorme/resinst.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/ships/melnorme/resinst.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1,3 +1,7 @@
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define CONFUSE_BIG_MASK_PMAP_ANIM "ship.melnorme.graphics.confuse.large"
#define CONFUSE_MED_MASK_PMAP_ANIM "ship.melnorme.graphics.confuse.medium"
#define CONFUSE_SML_MASK_PMAP_ANIM "ship.melnorme.graphics.confuse.small"
@@ -6,12 +10,10 @@
#define MELNORME_ICON_MASK_PMAP_ANIM "ship.melnorme.icons"
#define MELNORME_MED_MASK_PMAP_ANIM "ship.melnorme.graphics.trader.medium"
#define MELNORME_MICON_MASK_PMAP_ANIM "ship.melnorme.meleeicons"
+#define MELNORME_RACE_STRINGS "ship.melnorme.text"
+#define MELNORME_SHIP_SOUNDS "ship.melnorme.sounds"
#define MELNORME_SML_MASK_PMAP_ANIM "ship.melnorme.graphics.trader.small"
+#define MELNORME_VICTORY_SONG "ship.melnorme.ditty"
#define PUMPUP_BIG_MASK_PMAP_ANIM "ship.melnorme.graphics.pumpup.large"
#define PUMPUP_MED_MASK_PMAP_ANIM "ship.melnorme.graphics.pumpup.medium"
#define PUMPUP_SML_MASK_PMAP_ANIM "ship.melnorme.graphics.pumpup.small"
-#define MELNORME_RACE_STRINGS "ship.melnorme.text"
-#define MELNORME_SHIP_SOUNDS "ship.melnorme.sounds"
-#define MELNORME_VICTORY_SONG "ship.melnorme.ditty"
-
-#include "icode.h"
Modified: trunk/sc2/src/uqm/ships/mmrnmhrm/icode.h
===================================================================
--- trunk/sc2/src/uqm/ships/mmrnmhrm/icode.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/ships/mmrnmhrm/icode.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1 +1,5 @@
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define MMRNMHRM_CODE "ship.mmrnmhrm.code"
Modified: trunk/sc2/src/uqm/ships/mmrnmhrm/resinst.h
===================================================================
--- trunk/sc2/src/uqm/ships/mmrnmhrm/resinst.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/ships/mmrnmhrm/resinst.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1,3 +1,7 @@
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define MMRNMHRM_BIG_MASK_PMAP_ANIM "ship.mmrnmhrm.graphics.xform.large"
#define MMRNMHRM_CAPTAIN_MASK_PMAP_ANIM "ship.mmrnmhrm.graphics.captain"
#define MMRNMHRM_ICON_MASK_PMAP_ANIM "ship.mmrnmhrm.icons"
@@ -3,5 +7,8 @@
#define MMRNMHRM_MED_MASK_PMAP_ANIM "ship.mmrnmhrm.graphics.xform.medium"
#define MMRNMHRM_MICON_MASK_PMAP_ANIM "ship.mmrnmhrm.meleeicons"
+#define MMRNMHRM_RACE_STRINGS "ship.mmrnmhrm.text"
+#define MMRNMHRM_SHIP_SOUNDS "ship.mmrnmhrm.sounds"
#define MMRNMHRM_SML_MASK_PMAP_ANIM "ship.mmrnmhrm.graphics.xform.small"
+#define MMRNMHRM_VICTORY_SONG "ship.mmrnmhrm.ditty"
#define TORP_BIG_MASK_PMAP_ANIM "ship.mmrnmhrm.graphics.torpedo.large"
#define TORP_MED_MASK_PMAP_ANIM "ship.mmrnmhrm.graphics.torpedo.medium"
@@ -10,8 +17,3 @@
#define YWING_BIG_MASK_PMAP_ANIM "ship.mmrnmhrm.graphics.ywing.large"
#define YWING_MED_MASK_PMAP_ANIM "ship.mmrnmhrm.graphics.ywing.medium"
#define YWING_SML_MASK_PMAP_ANIM "ship.mmrnmhrm.graphics.ywing.small"
-#define MMRNMHRM_RACE_STRINGS "ship.mmrnmhrm.text"
-#define MMRNMHRM_SHIP_SOUNDS "ship.mmrnmhrm.sounds"
-#define MMRNMHRM_VICTORY_SONG "ship.mmrnmhrm.ditty"
-
-#include "icode.h"
Modified: trunk/sc2/src/uqm/ships/mycon/icode.h
===================================================================
--- trunk/sc2/src/uqm/ships/mycon/icode.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/ships/mycon/icode.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1 +1,5 @@
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define MYCON_CODE "ship.mycon.code"
Modified: trunk/sc2/src/uqm/ships/mycon/resinst.h
===================================================================
--- trunk/sc2/src/uqm/ships/mycon/resinst.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/ships/mycon/resinst.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1,3 +1,7 @@
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define MYCON_BIG_MASK_PMAP_ANIM "ship.mycon.graphics.podship.large"
#define MYCON_CAPTAIN_MASK_PMAP_ANIM "ship.mycon.graphics.captain"
#define MYCON_ICON_MASK_PMAP_ANIM "ship.mycon.icons"
@@ -3,11 +7,9 @@
#define MYCON_MED_MASK_PMAP_ANIM "ship.mycon.graphics.podship.medium"
#define MYCON_MICON_MASK_PMAP_ANIM "ship.mycon.meleeicons"
+#define MYCON_RACE_STRINGS "ship.mycon.text"
+#define MYCON_SHIP_SOUNDS "ship.mycon.sounds"
#define MYCON_SML_MASK_PMAP_ANIM "ship.mycon.graphics.podship.small"
+#define MYCON_VICTORY_SONG "ship.mycon.ditty"
#define PLASMA_BIG_MASK_PMAP_ANIM "ship.mycon.graphics.plasma.large"
#define PLASMA_MED_MASK_PMAP_ANIM "ship.mycon.graphics.plasma.medium"
#define PLASMA_SML_MASK_PMAP_ANIM "ship.mycon.graphics.plasma.small"
-#define MYCON_RACE_STRINGS "ship.mycon.text"
-#define MYCON_SHIP_SOUNDS "ship.mycon.sounds"
-#define MYCON_VICTORY_SONG "ship.mycon.ditty"
-
-#include "icode.h"
Modified: trunk/sc2/src/uqm/ships/orz/icode.h
===================================================================
--- trunk/sc2/src/uqm/ships/orz/icode.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/ships/orz/icode.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1 +1,5 @@
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define ORZ_CODE "ship.orz.code"
Modified: trunk/sc2/src/uqm/ships/orz/resinst.h
===================================================================
--- trunk/sc2/src/uqm/ships/orz/resinst.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/ships/orz/resinst.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1,3 +1,7 @@
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define HOWITZER_BIG_MASK_PMAP_ANIM "ship.orz.graphics.howitzer.large"
#define HOWITZER_MED_MASK_PMAP_ANIM "ship.orz.graphics.howitzer.medium"
#define HOWITZER_SML_MASK_PMAP_ANIM "ship.orz.graphics.howitzer.small"
@@ -6,12 +10,10 @@
#define ORZ_ICON_MASK_PMAP_ANIM "ship.orz.icons"
#define ORZ_MED_MASK_PMAP_ANIM "ship.orz.graphics.nemesis.medium"
#define ORZ_MICON_MASK_PMAP_ANIM "ship.orz.meleeicons"
+#define ORZ_RACE_STRINGS "ship.orz.text"
+#define ORZ_SHIP_SOUNDS "ship.orz.sounds"
#define ORZ_SML_MASK_PMAP_ANIM "ship.orz.graphics.nemesis.small"
+#define ORZ_VICTORY_SONG "ship.orz.ditty"
#define TURRET_BIG_MASK_PMAP_ANIM "ship.orz.graphics.turret.large"
#define TURRET_MED_MASK_PMAP_ANIM "ship.orz.graphics.turret.medium"
#define TURRET_SML_MASK_PMAP_ANIM "ship.orz.graphics.turret.small"
-#define ORZ_RACE_STRINGS "ship.orz.text"
-#define ORZ_SHIP_SOUNDS "ship.orz.sounds"
-#define ORZ_VICTORY_SONG "ship.orz.ditty"
-
-#include "icode.h"
Modified: trunk/sc2/src/uqm/ships/pkunk/icode.h
===================================================================
--- trunk/sc2/src/uqm/ships/pkunk/icode.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/ships/pkunk/icode.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1 +1,5 @@
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define PKUNK_CODE "ship.pkunk.code"
Modified: trunk/sc2/src/uqm/ships/pkunk/resinst.h
===================================================================
--- trunk/sc2/src/uqm/ships/pkunk/resinst.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/ships/pkunk/resinst.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1,3 +1,7 @@
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define BUG_BIG_MASK_PMAP_ANIM "ship.pkunk.graphics.bug.large"
#define BUG_MED_MASK_PMAP_ANIM "ship.pkunk.graphics.bug.medium"
#define BUG_SML_MASK_PMAP_ANIM "ship.pkunk.graphics.bug.small"
@@ -6,9 +10,7 @@
#define PKUNK_ICON_MASK_PMAP_ANIM "ship.pkunk.icons"
#define PKUNK_MED_MASK_PMAP_ANIM "ship.pkunk.graphics.fury.medium"
#define PKUNK_MICON_MASK_PMAP_ANIM "ship.pkunk.meleeicons"
-#define PKUNK_SML_MASK_PMAP_ANIM "ship.pkunk.graphics.fury.small"
#define PKUNK_RACE_STRINGS "ship.pkunk.text"
#define PKUNK_SHIP_SOUNDS "ship.pkunk.sounds"
+#define PKUNK_SML_MASK_PMAP_ANIM "ship.pkunk.graphics.fury.small"
#define PKUNK_VICTORY_SONG "ship.pkunk.ditty"
-
-#include "icode.h"
Modified: trunk/sc2/src/uqm/ships/probe/icode.h
===================================================================
--- trunk/sc2/src/uqm/ships/probe/icode.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/ships/probe/icode.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1 +1,5 @@
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define URQUAN_DRONE_CODE "ship.drone.code"
Modified: trunk/sc2/src/uqm/ships/probe/resinst.h
===================================================================
--- trunk/sc2/src/uqm/ships/probe/resinst.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/ships/probe/resinst.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1,3 +1,5 @@
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define URQUAN_DRONE_MICON_MASK_PMAP_ANIM "ship.drone.meleeicons"
-
-#include "icode.h"
Modified: trunk/sc2/src/uqm/ships/shofixti/icode.h
===================================================================
--- trunk/sc2/src/uqm/ships/shofixti/icode.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/ships/shofixti/icode.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1 +1,5 @@
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define SHOFIXTI_CODE "ship.shofixti.code"
Modified: trunk/sc2/src/uqm/ships/shofixti/resinst.h
===================================================================
--- trunk/sc2/src/uqm/ships/shofixti/resinst.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/ships/shofixti/resinst.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1,3 +1,7 @@
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define DART_BIG_MASK_PMAP_ANIM "ship.shofixti.graphics.missile.large"
#define DART_MED_MASK_PMAP_ANIM "ship.shofixti.graphics.missile.medium"
#define DART_SML_MASK_PMAP_ANIM "ship.shofixti.graphics.missile.small"
@@ -13,9 +17,7 @@
#define SHOFIXTI_ICON_MASK_PMAP_ANIM "ship.shofixti.icons"
#define SHOFIXTI_MED_MASK_PMAP_ANIM "ship.shofixti.graphics.scout.medium"
#define SHOFIXTI_MICON_MASK_PMAP_ANIM "ship.shofixti.meleeicons"
-#define SHOFIXTI_SML_MASK_PMAP_ANIM "ship.shofixti.graphics.scout.small"
#define SHOFIXTI_RACE_STRINGS "ship.shofixti.text"
#define SHOFIXTI_SHIP_SOUNDS "ship.shofixti.sounds"
+#define SHOFIXTI_SML_MASK_PMAP_ANIM "ship.shofixti.graphics.scout.small"
#define SHOFIXTI_VICTORY_SONG "ship.shofixti.ditty"
-
-#include "icode.h"
Modified: trunk/sc2/src/uqm/ships/sis_ship/icode.h
===================================================================
--- trunk/sc2/src/uqm/ships/sis_ship/icode.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/ships/sis_ship/icode.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1 +1,5 @@
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define SIS_CODE "ship.flagship.code"
Modified: trunk/sc2/src/uqm/ships/sis_ship/resinst.h
===================================================================
--- trunk/sc2/src/uqm/ships/sis_ship/resinst.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/ships/sis_ship/resinst.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1,3 +1,7 @@
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define BLASTER_BIG_MASK_PMAP_ANIM "ship.flagship.graphics.blaster.large"
#define BLASTER_MED_MASK_PMAP_ANIM "ship.flagship.graphics.blaster.medium"
#define BLASTER_SML_MASK_PMAP_ANIM "ship.flagship.graphics.blaster.small"
@@ -6,8 +10,6 @@
#define SIS_HYPER_MASK_PMAP_ANIM "ship.flagship.graphics.hyperspace"
#define SIS_ICON_MASK_PMAP_ANIM "ship.flagship.icons"
#define SIS_MED_MASK_PMAP_ANIM "ship.flagship.graphics.flagship.medium"
+#define SIS_SHIP_SOUNDS "ship.flagship.sounds"
#define SIS_SML_MASK_PMAP_ANIM "ship.flagship.graphics.flagship.small"
-#define SIS_SHIP_SOUNDS "ship.flagship.sounds"
#define SIS_VICTORY_SONG "ship.flagship.ditty"
-
-#include "icode.h"
Modified: trunk/sc2/src/uqm/ships/slylandr/icode.h
===================================================================
--- trunk/sc2/src/uqm/ships/slylandr/icode.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/ships/slylandr/icode.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1 +1,5 @@
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define SLYLANDRO_CODE "ship.slylandro.code"
Modified: trunk/sc2/src/uqm/ships/slylandr/resinst.h
===================================================================
--- trunk/sc2/src/uqm/ships/slylandr/resinst.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/ships/slylandr/resinst.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1,3 +1,7 @@
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define SLYLANDRO_BIG_MASK_PMAP_ANIM "ship.slylandro.graphics.probe.large"
#define SLYLANDRO_CAPTAIN_MASK_PMAP_ANIM "ship.slylandro.graphics.captain"
#define SLYLANDRO_ICON_MASK_PMAP_ANIM "ship.slylandro.icons"
@@ -3,8 +7,6 @@
#define SLYLANDRO_MED_MASK_PMAP_ANIM "ship.slylandro.graphics.probe.medium"
#define SLYLANDRO_MICON_MASK_PMAP_ANIM "ship.slylandro.meleeicons"
-#define SLYLANDRO_SML_MASK_PMAP_ANIM "ship.slylandro.graphics.probe.small"
#define SLYLANDRO_RACE_STRINGS "ship.slylandro.text"
#define SLYLANDRO_SHIP_SOUNDS "ship.slylandro.sounds"
+#define SLYLANDRO_SML_MASK_PMAP_ANIM "ship.slylandro.graphics.probe.small"
#define SLYLANDRO_VICTORY_SONG "ship.slylandro.ditty"
-
-#include "icode.h"
Modified: trunk/sc2/src/uqm/ships/spathi/icode.h
===================================================================
--- trunk/sc2/src/uqm/ships/spathi/icode.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/ships/spathi/icode.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1 +1,5 @@
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define SPATHI_CODE "ship.spathi.code"
Modified: trunk/sc2/src/uqm/ships/spathi/resinst.h
===================================================================
--- trunk/sc2/src/uqm/ships/spathi/resinst.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/ships/spathi/resinst.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1,3 +1,7 @@
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define DISCRIM_BIG_MASK_PMAP_ANIM "ship.spathi.graphics.butt.large"
#define DISCRIM_MED_MASK_PMAP_ANIM "ship.spathi.graphics.butt.medium"
#define DISCRIM_SML_MASK_PMAP_ANIM "ship.spathi.graphics.butt.small"
@@ -9,9 +13,7 @@
#define SPATHI_ICON_MASK_PMAP_ANIM "ship.spathi.icons"
#define SPATHI_MED_MASK_PMAP_ANIM "ship.spathi.graphics.eluder.medium"
#define SPATHI_MICON_MASK_PMAP_ANIM "ship.spathi.meleeicons"
-#define SPATHI_SML_MASK_PMAP_ANIM "ship.spathi.graphics.eluder.small"
#define SPATHI_RACE_STRINGS "ship.spathi.text"
#define SPATHI_SHIP_SOUNDS "ship.spathi.sounds"
+#define SPATHI_SML_MASK_PMAP_ANIM "ship.spathi.graphics.eluder.small"
#define SPATHI_VICTORY_SONG "ship.spathi.ditty"
-
-#include "icode.h"
Modified: trunk/sc2/src/uqm/ships/supox/icode.h
===================================================================
--- trunk/sc2/src/uqm/ships/supox/icode.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/ships/supox/icode.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1 +1,5 @@
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define SUPOX_CODE "ship.supox.code"
Modified: trunk/sc2/src/uqm/ships/supox/resinst.h
===================================================================
--- trunk/sc2/src/uqm/ships/supox/resinst.h 2011-07-18 22:17:22 UTC (rev 3655)
+++ trunk/sc2/src/uqm/ships/supox/resinst.h 2011-07-19 18:34:45 UTC (rev 3656)
@@ -1,3 +1,7 @@
+/* This file was auto-generated by the gen_resfiles utility and
+ should not be edited directly. Modify the master resource list
+ instead and regenerate. */
+
#define GOB_BIG_MASK_PMAP_ANIM "ship.supox.graphics.glob.large"
#define GOB_MED_MASK_PMAP_ANIM "ship.supox.graphics.glob.medium"
#define GOB_SML_MASK_PMAP_ANIM "ship.supox.graphics.glob.small"
@@ -6,9 +10,7 @@
#define SUPOX_ICON_MASK_PMAP_ANIM "ship.supox.icons"
#define SUPOX_MED_MASK_PMAP_ANIM "ship.supox.graphics.blade.medium"
#define SUPOX_MICON_MASK_PMAP_ANIM "ship.supox.meleeicons"
-#define SUPOX_SML_MASK_PMAP_ANIM "ship.supox.graphics.blade.small"
#define SUPOX_RACE_STRINGS "ship.supox.text"
#define SUPOX_SHIP_SOUNDS "ship.supox.sounds"
+#define SUPOX_SML_MASK_PMAP_ANIM "ship.supox.graphics.blade.small"
#define SUPOX_VICTORY_SONG "ship.supox.ditty"
-
-#include "icode.h"
Modified: trunk/sc2/src/uqm/ships/syreen/icode.h
===================================================================
--- trunk/sc2/src/uqm/ships/s...
[truncated message content] |
|
From: <av...@us...> - 2011-07-18 22:17:28
|
Revision: 3655
http://sc2.svn.sourceforge.net/sc2/?rev=3655&view=rev
Author: avolkov
Date: 2011-07-18 22:17:22 +0000 (Mon, 18 Jul 2011)
Log Message:
-----------
Minor addon loading cleanup
Modified Paths:
--------------
trunk/sc2/src/options.c
Modified: trunk/sc2/src/options.c
===================================================================
--- trunk/sc2/src/options.c 2011-07-17 18:31:14 UTC (rev 3654)
+++ trunk/sc2/src/options.c 2011-07-18 22:17:22 UTC (rev 3655)
@@ -420,7 +420,7 @@
count = 0;
for (i = 0; i < availableAddons->numNames; ++i)
{
- static char mountname[128];
+ char mountname[128];
uio_DirHandle *addonDir;
const char *addon = availableAddons->names[i];
@@ -430,8 +430,7 @@
++count;
log_add (log_Info, " %d. %s", count, addon);
- snprintf(mountname, 128, "addons/%s", addon);
- mountname[127]=0;
+ snprintf (mountname, sizeof mountname, "addons/%s", addon);
addonDir = uio_openDirRelative (addonsDir, addon, 0);
if (addonDir == NULL)
@@ -532,6 +531,11 @@
}
numLoaded = loadIndices (addonDir);
+ if (!numLoaded)
+ {
+ log_add (log_Error, "No RMP index files were loaded for addon '%s'",
+ addon);
+ }
uio_closeDir (addonDir);
uio_closeDir (addonsDir);
@@ -583,6 +587,9 @@
log_add (log_Info, "Loading addon '%s'", *addons);
if (!loadAddon (*addons))
{
+ // TODO: Should we do something like inform the user?
+ // Why simply refuse to load other addons?
+ // Maybe exit() to inform the user of the failure?
break;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Mee...@us...> - 2011-07-17 18:31:20
|
Revision: 3654
http://sc2.svn.sourceforge.net/sc2/?rev=3654&view=rev
Author: Meep-Eep
Date: 2011-07-17 18:31:14 +0000 (Sun, 17 Jul 2011)
Log Message:
-----------
Fix error introduced by adding .h files to Makeinfo.
Modified Paths:
--------------
trunk/sc2/src/libs/network/netmanager/Makeinfo
Modified: trunk/sc2/src/libs/network/netmanager/Makeinfo
===================================================================
--- trunk/sc2/src/libs/network/netmanager/Makeinfo 2011-07-17 17:59:57 UTC (rev 3653)
+++ trunk/sc2/src/libs/network/netmanager/Makeinfo 2011-07-17 18:31:14 UTC (rev 3654)
@@ -3,9 +3,9 @@
if [ -n "$uqm_USE_WINSOCK" ]; then
uqm_CFILES="$uqm_CFILES netmanager_win.c"
- uqm_CFILES="$uqm_HFILES netmanager_win.h"
+ uqm_HFILES="$uqm_HFILES netmanager_win.h"
else
uqm_CFILES="$uqm_CFILES netmanager_bsd.c"
- uqm_CFILES="$uqm_HFILES netmanager_bsd.h"
+ uqm_HFILES="$uqm_HFILES netmanager_bsd.h"
fi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <av...@us...> - 2011-07-17 18:00:03
|
Revision: 3653
http://sc2.svn.sourceforge.net/sc2/?rev=3653&view=rev
Author: avolkov
Date: 2011-07-17 17:59:57 +0000 (Sun, 17 Jul 2011)
Log Message:
-----------
Preserve the remix options between visits to the setup menu; bug #1132
Modified Paths:
--------------
trunk/sc2/ChangeLog
trunk/sc2/src/uqm/setupmenu.c
Modified: trunk/sc2/ChangeLog
===================================================================
--- trunk/sc2/ChangeLog 2011-07-17 17:42:51 UTC (rev 3652)
+++ trunk/sc2/ChangeLog 2011-07-17 17:59:57 UTC (rev 3653)
@@ -1,4 +1,6 @@
Changes towards version 0.8:
+- All Sound Options are now preserved between visits to the setup menu.
+ Some options still require a restart (bug #1132) - Alex
- Removed the remnants of the --music option (bug #1133) - Alex
- Fixed flagship re-entering the inner system after an encounter in the
outer system, thus trapping the player (bug #1135) - Alex
@@ -7,6 +9,7 @@
- Refactor Melnorme comm code to make modding easier; step 1 (bug #1128),
from Scott A. Colcord
- Added aspect ratio option to the setup menu - Alex
+- Positional audio setup menu option now has an immediate effect - Alex
- Added speech option which controls loading of 3dovoice addon (no need
to set speech volume to 0 anymore) - Alex
- Added the MetaChron story to the no-voice Melnorme script (bug #43) - Alex
Modified: trunk/sc2/src/uqm/setupmenu.c
===================================================================
--- trunk/sc2/src/uqm/setupmenu.c 2011-07-17 17:42:51 UTC (rev 3652)
+++ trunk/sc2/src/uqm/setupmenu.c 2011-07-17 17:59:57 UTC (rev 3653)
@@ -1506,13 +1506,14 @@
}
optSubtitles = (opts->subtitles == OPTVAL_ENABLED) ? TRUE : FALSE;
- // optWhichMusic = (opts->music == OPTVAL_3DO) ? OPT_3DO : OPT_PC;
optWhichMenu = (opts->menu == OPTVAL_3DO) ? OPT_3DO : OPT_PC;
optWhichFonts = (opts->text == OPTVAL_3DO) ? OPT_3DO : OPT_PC;
optWhichCoarseScan = (opts->cscan == OPTVAL_3DO) ? OPT_3DO : OPT_PC;
optSmoothScroll = (opts->scroll == OPTVAL_3DO) ? OPT_3DO : OPT_PC;
optWhichShield = (opts->shield == OPTVAL_3DO) ? OPT_3DO : OPT_PC;
optMeleeScale = (opts->meleezoom == OPTVAL_3DO) ? TFB_SCALE_TRILINEAR : TFB_SCALE_STEP;
+ opt3doMusic = (opts->music3do == OPTVAL_ENABLED);
+ optRemixMusic = (opts->musicremix == OPTVAL_ENABLED);
optSpeech = (opts->speech == OPTVAL_ENABLED);
optWhichIntro = (opts->intro == OPTVAL_3DO) ? OPT_3DO : OPT_PC;
optStereoSFX = (opts->stereo == OPTVAL_ENABLED);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <av...@us...> - 2011-07-17 17:42:57
|
Revision: 3652
http://sc2.svn.sourceforge.net/sc2/?rev=3652&view=rev
Author: avolkov
Date: 2011-07-17 17:42:51 +0000 (Sun, 17 Jul 2011)
Log Message:
-----------
Fixed Pkunk how_goes_war player phrase (removed the line break); bug #1136
Modified Paths:
--------------
trunk/sc2/content/base/comm/pkunk/pkunk.txt
Modified: trunk/sc2/content/base/comm/pkunk/pkunk.txt
===================================================================
--- trunk/sc2/content/base/comm/pkunk/pkunk.txt 2011-07-17 09:04:26 UTC (rev 3651)
+++ trunk/sc2/content/base/comm/pkunk/pkunk.txt 2011-07-17 17:42:51 UTC (rev 3652)
@@ -551,8 +551,7 @@
We will be somewhat disappointed to have to leave it.
#(how_goes_war)
-I seem to be having a little trouble defeating the Ur-Quan Hierarchy.
-Do you have any helpful advice for me?
+I seem to be having a little trouble defeating the Ur-Quan Hierarchy. Do you have any helpful advice for me?
#(WAR_GOES_1) pkunk-071.ogg
Well, not advice exactly, but I can offer you plenty of moral support.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Mee...@us...> - 2011-07-17 09:04:35
|
Revision: 3651
http://sc2.svn.sourceforge.net/sc2/?rev=3651&view=rev
Author: Meep-Eep
Date: 2011-07-17 09:04:26 +0000 (Sun, 17 Jul 2011)
Log Message:
-----------
Add .h files to Makeinfo, so that we can generate files based on these too.
(In a future commit)
Modified Paths:
--------------
trunk/sc2/src/Makeinfo
trunk/sc2/src/darwin/Makeinfo
trunk/sc2/src/getopt/Makeinfo
trunk/sc2/src/libs/Makeinfo
trunk/sc2/src/libs/callback/Makeinfo
trunk/sc2/src/libs/cdp/Makeinfo
trunk/sc2/src/libs/decomp/Makeinfo
trunk/sc2/src/libs/file/Makeinfo
trunk/sc2/src/libs/graphics/Makeinfo
trunk/sc2/src/libs/graphics/sdl/Makeinfo
trunk/sc2/src/libs/heap/Makeinfo
trunk/sc2/src/libs/input/Makeinfo
trunk/sc2/src/libs/input/sdl/Makeinfo
trunk/sc2/src/libs/list/Makeinfo
trunk/sc2/src/libs/log/Makeinfo
trunk/sc2/src/libs/math/Makeinfo
trunk/sc2/src/libs/md5/Makeinfo
trunk/sc2/src/libs/mikmod/Makeinfo
trunk/sc2/src/libs/network/Makeinfo
trunk/sc2/src/libs/network/connect/Makeinfo
trunk/sc2/src/libs/network/netmanager/Makeinfo
trunk/sc2/src/libs/network/socket/Makeinfo
trunk/sc2/src/libs/resource/Makeinfo
trunk/sc2/src/libs/sound/Makeinfo
trunk/sc2/src/libs/sound/decoders/Makeinfo
trunk/sc2/src/libs/sound/mixer/Makeinfo
trunk/sc2/src/libs/sound/mixer/nosound/Makeinfo
trunk/sc2/src/libs/sound/mixer/sdl/Makeinfo
trunk/sc2/src/libs/sound/openal/Makeinfo
trunk/sc2/src/libs/strings/Makeinfo
trunk/sc2/src/libs/threads/Makeinfo
trunk/sc2/src/libs/threads/pthread/Makeinfo
trunk/sc2/src/libs/threads/sdl/Makeinfo
trunk/sc2/src/libs/time/Makeinfo
trunk/sc2/src/libs/time/sdl/Makeinfo
trunk/sc2/src/libs/uio/Makeinfo
trunk/sc2/src/libs/uio/stdio/Makeinfo
trunk/sc2/src/libs/uio/zip/Makeinfo
trunk/sc2/src/libs/video/Makeinfo
trunk/sc2/src/regex/Makeinfo
trunk/sc2/src/uqm/Makeinfo
trunk/sc2/src/uqm/comm/Makeinfo
trunk/sc2/src/uqm/comm/arilou/Makeinfo
trunk/sc2/src/uqm/comm/blackur/Makeinfo
trunk/sc2/src/uqm/comm/chmmr/Makeinfo
trunk/sc2/src/uqm/comm/comandr/Makeinfo
trunk/sc2/src/uqm/comm/druuge/Makeinfo
trunk/sc2/src/uqm/comm/ilwrath/Makeinfo
trunk/sc2/src/uqm/comm/melnorm/Makeinfo
trunk/sc2/src/uqm/comm/mycon/Makeinfo
trunk/sc2/src/uqm/comm/orz/Makeinfo
trunk/sc2/src/uqm/comm/pkunk/Makeinfo
trunk/sc2/src/uqm/comm/rebel/Makeinfo
trunk/sc2/src/uqm/comm/shofixt/Makeinfo
trunk/sc2/src/uqm/comm/slyhome/Makeinfo
trunk/sc2/src/uqm/comm/slyland/Makeinfo
trunk/sc2/src/uqm/comm/spahome/Makeinfo
trunk/sc2/src/uqm/comm/spathi/Makeinfo
trunk/sc2/src/uqm/comm/starbas/Makeinfo
trunk/sc2/src/uqm/comm/supox/Makeinfo
trunk/sc2/src/uqm/comm/syreen/Makeinfo
trunk/sc2/src/uqm/comm/talkpet/Makeinfo
trunk/sc2/src/uqm/comm/thradd/Makeinfo
trunk/sc2/src/uqm/comm/umgah/Makeinfo
trunk/sc2/src/uqm/comm/urquan/Makeinfo
trunk/sc2/src/uqm/comm/utwig/Makeinfo
trunk/sc2/src/uqm/comm/vux/Makeinfo
trunk/sc2/src/uqm/comm/yehat/Makeinfo
trunk/sc2/src/uqm/comm/zoqfot/Makeinfo
trunk/sc2/src/uqm/planets/Makeinfo
trunk/sc2/src/uqm/planets/generate/Makeinfo
trunk/sc2/src/uqm/ships/Makeinfo
trunk/sc2/src/uqm/ships/androsyn/Makeinfo
trunk/sc2/src/uqm/ships/arilou/Makeinfo
trunk/sc2/src/uqm/ships/blackurq/Makeinfo
trunk/sc2/src/uqm/ships/chenjesu/Makeinfo
trunk/sc2/src/uqm/ships/chmmr/Makeinfo
trunk/sc2/src/uqm/ships/druuge/Makeinfo
trunk/sc2/src/uqm/ships/human/Makeinfo
trunk/sc2/src/uqm/ships/ilwrath/Makeinfo
trunk/sc2/src/uqm/ships/lastbat/Makeinfo
trunk/sc2/src/uqm/ships/melnorme/Makeinfo
trunk/sc2/src/uqm/ships/mmrnmhrm/Makeinfo
trunk/sc2/src/uqm/ships/mycon/Makeinfo
trunk/sc2/src/uqm/ships/orz/Makeinfo
trunk/sc2/src/uqm/ships/pkunk/Makeinfo
trunk/sc2/src/uqm/ships/probe/Makeinfo
trunk/sc2/src/uqm/ships/shofixti/Makeinfo
trunk/sc2/src/uqm/ships/sis_ship/Makeinfo
trunk/sc2/src/uqm/ships/slylandr/Makeinfo
trunk/sc2/src/uqm/ships/spathi/Makeinfo
trunk/sc2/src/uqm/ships/supox/Makeinfo
trunk/sc2/src/uqm/ships/syreen/Makeinfo
trunk/sc2/src/uqm/ships/thradd/Makeinfo
trunk/sc2/src/uqm/ships/umgah/Makeinfo
trunk/sc2/src/uqm/ships/urquan/Makeinfo
trunk/sc2/src/uqm/ships/utwig/Makeinfo
trunk/sc2/src/uqm/ships/vux/Makeinfo
trunk/sc2/src/uqm/ships/yehat/Makeinfo
trunk/sc2/src/uqm/ships/zoqfot/Makeinfo
trunk/sc2/src/uqm/supermelee/Makeinfo
trunk/sc2/src/uqm/supermelee/netplay/Makeinfo
trunk/sc2/src/uqm/supermelee/netplay/proto/Makeinfo
Modified: trunk/sc2/src/Makeinfo
===================================================================
--- trunk/sc2/src/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1,4 +1,6 @@
uqm_SUBDIRS="libs res uqm"
+uqm_CFILES="options.c port.c uqm.c"
+uqm_HFILES="config.h endian_uqm.h options.h port.h types.h uqmversion.h"
if [ "$uqm_HAVE_GETOPT_LONG" = 0 ]; then
uqm_SUBDIRS="$uqm_SUBDIRS getopt"
@@ -8,11 +10,12 @@
Darwin)
uqm_SUBDIRS="$uqm_SUBDIRS darwin"
;;
+ MSVC)
+ uqm_HFILES="$uqm_HFILES config_vc6.h"
+ ;;
esac
if [ "$uqm_HAVE_REGEX" = 0 ]; then
uqm_SUBDIRS="$uqm_SUBDIRS regex"
fi
-uqm_CFILES="options.c port.c uqm.c"
-
Modified: trunk/sc2/src/darwin/Makeinfo
===================================================================
--- trunk/sc2/src/darwin/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/darwin/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1,2 +1,2 @@
uqm_MFILES="SDLMain.m"
-
+uqm_HFILES="SDLMain.h"
Modified: trunk/sc2/src/getopt/Makeinfo
===================================================================
--- trunk/sc2/src/getopt/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/getopt/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="getopt.c getopt1.c"
+uqm_HFILES="getopt.h"
Modified: trunk/sc2/src/libs/Makeinfo
===================================================================
--- trunk/sc2/src/libs/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/libs/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -12,3 +12,8 @@
# uqm_SUBDIRS="$UQM_SUBDIRS debug"
#fi
+uqm_HFILES="alarm.h callback.h cdplib.h compiler.h declib.h file.h gfxlib.h
+ heap.h inplib.h list.h log.h mathlib.h md5.h memlib.h misc.h net.h
+ platform.h reslib.h sndlib.h strlib.h tasklib.h threadlib.h
+ timelib.h uio.h uioutils.h unicode.h vidlib.h"
+
Modified: trunk/sc2/src/libs/callback/Makeinfo
===================================================================
--- trunk/sc2/src/libs/callback/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/libs/callback/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1,2 +1,2 @@
uqm_CFILES="alarm.c callback.c"
-
+uqm_HFILES="alarm.h callback.h"
Modified: trunk/sc2/src/libs/cdp/Makeinfo
===================================================================
--- trunk/sc2/src/libs/cdp/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/libs/cdp/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,3 @@
uqm_CFILES="cdp.c cdpapi.c"
+uqm_HFILES="cdp_alli.h cdpapi.h cdp.h cdp_iio.h cdp_imem.h cdpint.h
+ cdp_isnd.h cdp_ivid.h cdpmod.h windl.h"
Modified: trunk/sc2/src/libs/decomp/Makeinfo
===================================================================
--- trunk/sc2/src/libs/decomp/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/libs/decomp/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="lzdecode.c lzencode.c update.c"
+uqm_HFILES="lzh.h"
Modified: trunk/sc2/src/libs/file/Makeinfo
===================================================================
--- trunk/sc2/src/libs/file/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/libs/file/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="dirs.c files.c"
+uqm_HFILES="filintrn.h"
Modified: trunk/sc2/src/libs/graphics/Makeinfo
===================================================================
--- trunk/sc2/src/libs/graphics/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/libs/graphics/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -7,3 +7,6 @@
font.c frame.c gfx_common.c intersec.c loaddisp.c
pixmap.c resgfx.c tfb_draw.c tfb_prim.c widgets.c"
+uqm_HFILES="bbox.h cmap.h context.h dcqueue.h drawable.h drawcmd.h font.h
+ gfx_common.h gfxintrn.h prim.h tfb_draw.h tfb_prim.h widgets.h"
+
Modified: trunk/sc2/src/libs/graphics/sdl/Makeinfo
===================================================================
--- trunk/sc2/src/libs/graphics/sdl/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/libs/graphics/sdl/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1,5 +1,8 @@
-uqm_CFILES="opengl.c palette.c primitives.c pure.c sdl_common.c
- scalers.c 2xscalers.c
- 2xscalers_mmx.c 2xscalers_sse.c 2xscalers_3dnow.c
- nearest2x.c bilinear2x.c biadv2x.c triscan2x.c hq2x.c
- canvas.c sdluio.c rotozoom.c"
+uqm_CFILES="opengl.c palette.c primitives.c pure.c sdl_common.c scalers.c
+ 2xscalers.c 2xscalers_mmx.c 2xscalers_sse.c 2xscalers_3dnow.c
+ nearest2x.c bilinear2x.c biadv2x.c triscan2x.c hq2x.c canvas.c
+ sdluio.c rotozoom.c"
+uqm_HFILES="2xscalers.h 2xscalers_mmx.h opengl.h palette.h primitives.h
+ pure.h rotozoom.h scaleint.h scalemmx.h scalers.h sdl_common.h
+ sdluio.h"
+
Modified: trunk/sc2/src/libs/heap/Makeinfo
===================================================================
--- trunk/sc2/src/libs/heap/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/libs/heap/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1,2 +1,2 @@
uqm_CFILES="heap.c"
-
+uqm_HFILES="heap.h"
Modified: trunk/sc2/src/libs/input/Makeinfo
===================================================================
--- trunk/sc2/src/libs/input/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/libs/input/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -3,3 +3,4 @@
fi
uqm_CFILES="input_common.c"
+uqm_HFILES="inpintrn.h input_common.h"
Modified: trunk/sc2/src/libs/input/sdl/Makeinfo
===================================================================
--- trunk/sc2/src/libs/input/sdl/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/libs/input/sdl/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="input.c keynames.c vcontrol.c"
+uqm_HFILES="input.h keynames.h vcontrol.h"
Modified: trunk/sc2/src/libs/list/Makeinfo
===================================================================
--- trunk/sc2/src/libs/list/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/libs/list/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="list.c"
+uqm_HFILES="list.h"
Modified: trunk/sc2/src/libs/log/Makeinfo
===================================================================
--- trunk/sc2/src/libs/log/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/libs/log/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1,4 +1,5 @@
uqm_CFILES="uqmlog.c"
+uqm_HFILES="loginternal.h msgbox.h uqmlog.h"
case "$HOST_SYSTEM" in
Darwin)
@@ -11,3 +12,4 @@
uqm_CFILES="$uqm_CFILES msgbox_stub.c"
;;
esac
+
Modified: trunk/sc2/src/libs/math/Makeinfo
===================================================================
--- trunk/sc2/src/libs/math/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/libs/math/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="random.c random2.c sqrt.c"
+uqm_HFILES="mthintrn.h random.h"
Modified: trunk/sc2/src/libs/md5/Makeinfo
===================================================================
--- trunk/sc2/src/libs/md5/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/libs/md5/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1,2 +1,2 @@
uqm_CFILES="md5.c"
-
+uqm_HFILES="md5.h"
Modified: trunk/sc2/src/libs/mikmod/Makeinfo
===================================================================
--- trunk/sc2/src/libs/mikmod/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/libs/mikmod/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -2,3 +2,4 @@
mdreg.c mdriver.c mloader.c
mlreg.c mlutil.c mmalloc.c mmerror.c mmio.c mplayer.c munitrk.c
mwav.c npertab.c sloader.c virtch.c virtch2.c virtch_common.c"
+uqm_HFILES="mikmod_build.h mikmod.h mikmod_internals.h"
Modified: trunk/sc2/src/libs/network/Makeinfo
===================================================================
--- trunk/sc2/src/libs/network/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/libs/network/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1,9 +1,12 @@
uqm_SUBDIRS="connect netmanager socket"
uqm_CFILES="netport.c"
+uqm_HFILES="bytesex.h netport.h network.h"
+
if [ -n "$uqm_USE_WINSOCK" ]; then
uqm_CFILES="$uqm_CFILES network_win.c"
if [ -n "$MACRO___MINGW32__" ]; then
uqm_CFILES="$uqm_CFILES wspiapiwrap.c"
+ uqm_HFILES="$uqm_HFILES wspiapiwrap.h"
fi
else
uqm_CFILES="$uqm_CFILES network_bsd.c"
Modified: trunk/sc2/src/libs/network/connect/Makeinfo
===================================================================
--- trunk/sc2/src/libs/network/connect/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/libs/network/connect/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1,2 +1,2 @@
uqm_CFILES="connect.c listen.c resolve.c"
-
+uqm_HFILES="connect.h listen.h resolve.h"
Modified: trunk/sc2/src/libs/network/netmanager/Makeinfo
===================================================================
--- trunk/sc2/src/libs/network/netmanager/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/libs/network/netmanager/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1,8 +1,11 @@
uqm_CFILES="ndesc.c"
+uqm_HFILES="ndesc.h netmanager.h"
+
if [ -n "$uqm_USE_WINSOCK" ]; then
uqm_CFILES="$uqm_CFILES netmanager_win.c"
+ uqm_CFILES="$uqm_HFILES netmanager_win.h"
else
uqm_CFILES="$uqm_CFILES netmanager_bsd.c"
+ uqm_CFILES="$uqm_HFILES netmanager_bsd.h"
fi
-
Modified: trunk/sc2/src/libs/network/socket/Makeinfo
===================================================================
--- trunk/sc2/src/libs/network/socket/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/libs/network/socket/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1,7 +1,11 @@
uqm_CFILES="socket.c"
+uqm_HFILES="socket.h"
+
if [ -n "$uqm_USE_WINSOCK" ]; then
uqm_CFILES="$uqm_CFILES socket_win.c"
+ uqm_HFILES="$uqm_HFILES socket_win.h"
else
uqm_CFILES="$uqm_CFILES socket_bsd.c"
+ uqm_HFILES="$uqm_CFILES socket_bsd.h"
fi
Modified: trunk/sc2/src/libs/resource/Makeinfo
===================================================================
--- trunk/sc2/src/libs/resource/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/libs/resource/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1,2 +1,3 @@
uqm_CFILES="direct.c filecntl.c getres.c loadres.c stringbank.c
propfile.c resinit.c"
+uqm_HFILES="index.h propfile.h resintrn.h stringbank.h"
Modified: trunk/sc2/src/libs/sound/Makeinfo
===================================================================
--- trunk/sc2/src/libs/sound/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/libs/sound/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -6,4 +6,4 @@
fi
uqm_CFILES="audiocore.c fileinst.c resinst.c sound.c sfx.c music.c stream.c trackplayer.c"
-
+uqm_HFILES="audiocore.h sndintrn.h sound.h stream.h trackint.h trackplayer.h"
Modified: trunk/sc2/src/libs/sound/decoders/Makeinfo
===================================================================
--- trunk/sc2/src/libs/sound/decoders/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/libs/sound/decoders/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1,6 +1,8 @@
uqm_CFILES="decoder.c aiffaud.c wav.c dukaud.c modaud.c"
+uqm_HFILES="aiffaud.h decoder.h dukaud.h modaud.h wav.h"
if [ "$uqm_OGGVORBIS" '!=' "none" ]; then
uqm_CFILES="$uqm_CFILES oggaud.c"
+ uqm_HFILES="$uqm_HFILES oggaud.h"
fi
Modified: trunk/sc2/src/libs/sound/mixer/Makeinfo
===================================================================
--- trunk/sc2/src/libs/sound/mixer/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/libs/sound/mixer/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1,2 +1,3 @@
uqm_SUBDIRS="sdl nosound"
uqm_CFILES="mixer.c"
+uqm_HFILES="mixer.h mixerint.h"
Modified: trunk/sc2/src/libs/sound/mixer/nosound/Makeinfo
===================================================================
--- trunk/sc2/src/libs/sound/mixer/nosound/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/libs/sound/mixer/nosound/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="audiodrv_nosound.c"
+uqm_HFILES="audiodrv_nosound.h"
Modified: trunk/sc2/src/libs/sound/mixer/sdl/Makeinfo
===================================================================
--- trunk/sc2/src/libs/sound/mixer/sdl/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/libs/sound/mixer/sdl/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="audiodrv_sdl.c"
+uqm_HFILES="audiodrv_sdl.h"
Modified: trunk/sc2/src/libs/sound/openal/Makeinfo
===================================================================
--- trunk/sc2/src/libs/sound/openal/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/libs/sound/openal/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="audiodrv_openal.c"
+uqm_HFILES="audiodrv_openal.h"
Modified: trunk/sc2/src/libs/strings/Makeinfo
===================================================================
--- trunk/sc2/src/libs/strings/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/libs/strings/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="getstr.c sfileins.c sresins.c strings.c unicode.c"
+uqm_HFILES="strintrn.h"
Modified: trunk/sc2/src/libs/threads/Makeinfo
===================================================================
--- trunk/sc2/src/libs/threads/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/libs/threads/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -6,4 +6,6 @@
uqm_SUBDIRS="pthread"
;;
esac
+
uqm_CFILES="thrcommon.c"
+uqm_HFILES="thrcommon.h"
Modified: trunk/sc2/src/libs/threads/pthread/Makeinfo
===================================================================
--- trunk/sc2/src/libs/threads/pthread/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/libs/threads/pthread/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="posixthreads.c"
+uqm_HFILES="posixthreads.h"
Modified: trunk/sc2/src/libs/threads/sdl/Makeinfo
===================================================================
--- trunk/sc2/src/libs/threads/sdl/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/libs/threads/sdl/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="sdlthreads.c"
+uqm_HFILES="sdlthreads.h"
Modified: trunk/sc2/src/libs/time/Makeinfo
===================================================================
--- trunk/sc2/src/libs/time/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/libs/time/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1,2 +1,3 @@
uqm_SUBDIRS="sdl"
uqm_CFILES="timecommon.c"
+uqm_HFILES="timecommon.h"
Modified: trunk/sc2/src/libs/time/sdl/Makeinfo
===================================================================
--- trunk/sc2/src/libs/time/sdl/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/libs/time/sdl/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="sdltime.c"
+uqm_HFILES="sdltime.h"
Modified: trunk/sc2/src/libs/uio/Makeinfo
===================================================================
--- trunk/sc2/src/libs/uio/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/libs/uio/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1,8 +1,10 @@
uqm_SUBDIRS="stdio"
-uqm_CFILES="charhashtable.c defaultfs.c fileblock.c fstypes.c
- gphys.c io.c ioaux.c match.c mount.c
- mounttree.c paths.c physical.c uiostream.c uioutils.c
- utils.c"
+uqm_CFILES="charhashtable.c defaultfs.c fileblock.c fstypes.c gphys.c io.c
+ ioaux.c match.c mount.c mounttree.c paths.c physical.c uiostream.c
+ uioutils.c utils.c"
+uqm_HFILES="charhashtable.h defaultfs.h fileblock.h fstypes.h getint.h
+ gphys.h ioaux.h io.h iointrn.h match.h mem.h mount.h mounttree.h
+ paths.h physical.h types.h uioport.h uiostream.h uioutils.h utils.h"
if [ -n "$uqm_USE_ZIP_IO" ]; then
uqm_SUBDIRS="$uqm_SUBDIRS zip"
@@ -10,9 +12,11 @@
#if [ -n "$DEBUG" -o -n "$uqm_UIO_DEBUG" ]; then
uqm_CFILES="$uqm_CFILES debug.c"
+ uqm_HFILES="$uqm_HFILES debug.h"
#fi
if [ -n "$MEMDEBUG" ]; then
uqm_CFILES="$uqm_CFILES hashtable.c memdebug.c"
+ uqm_HFILES="$uqm_HFILES hashtable.h memdebug.h"
fi
Modified: trunk/sc2/src/libs/uio/stdio/Makeinfo
===================================================================
--- trunk/sc2/src/libs/uio/stdio/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/libs/uio/stdio/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1,3 +1,2 @@
uqm_CFILES="stdio.c"
-
-
+uqm_HFILES="stdio.h"
Modified: trunk/sc2/src/libs/uio/zip/Makeinfo
===================================================================
--- trunk/sc2/src/libs/uio/zip/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/libs/uio/zip/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1,3 +1,2 @@
uqm_CFILES="zip.c"
-
-
+uqm_HFILES="zip.h"
Modified: trunk/sc2/src/libs/video/Makeinfo
===================================================================
--- trunk/sc2/src/libs/video/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/libs/video/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1,2 +1,3 @@
uqm_CFILES="vfileins.c vresins.c video.c videodec.c vidplayer.c dukvid.c \
legacyplayer.c"
+uqm_HFILES="dukvid.h videodec.h video.h vidintrn.h vidplayer.h"
Modified: trunk/sc2/src/regex/Makeinfo
===================================================================
--- trunk/sc2/src/regex/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/regex/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1,2 +1,2 @@
uqm_CFILES="regex.c"
-
+uqm_HFILES="regex.h regex_internal.h"
Modified: trunk/sc2/src/uqm/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -9,4 +9,14 @@
ship.c shipstat.c shipyard.c sis.c sounds.c starbase.c starcon.c
starmap.c state.c status.c tactrans.c trans.c uqmdebug.c util.c
velocity.c weapon.c"
+uqm_HFILES="battlecontrols.h battle.h build.h clock.h cnctdlg.h coderes.h
+ collide.h colors.h commanim.h commglue.h comm.h cons_res.h controls.h
+ corecode.h credits.h demo.h displist.h dummy.h element.h encount.h
+ flash.h fmv.h gameev.h gameopt.h gamestr.h gendef.h globdata.h
+ grpinfo.h hyper.h ifontres.h igfxres.h ikey_con.h imusicre.h init.h
+ intel.h ipdisp.h isndres.h istrtab.h load.h master.h menustat.h
+ nameref.h oscill.h pickship.h process.h races.h resinst.h respkg.h
+ restart.h save.h settings.h setup.h setupmenu.h shipcont.h ship.h
+ sis.h sounds.h starbase.h starcon.h state.h status.h tactrans.h
+ units.h uqmdebug.h util.h velocity.h weapon.h"
Modified: trunk/sc2/src/uqm/comm/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/comm/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/comm/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1,3 +1,4 @@
uqm_SUBDIRS="arilou blackur chmmr comandr druuge ilwrath melnorm mycon
orz pkunk rebel shofixt slyhome slyland spahome spathi starbas supox
syreen talkpet thradd umgah urquan utwig vux yehat zoqfot"
+uqm_HFILES="commall.h"
Modified: trunk/sc2/src/uqm/comm/arilou/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/comm/arilou/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/comm/arilou/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="arilouc.c"
+uqm_HFILES="resinst.h strings.h"
Modified: trunk/sc2/src/uqm/comm/blackur/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/comm/blackur/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/comm/blackur/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="blackurc.c"
+uqm_HFILES="resinst.h strings.h"
Modified: trunk/sc2/src/uqm/comm/chmmr/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/comm/chmmr/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/comm/chmmr/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="chmmrc.c"
+uqm_HFILES="resinst.h strings.h"
Modified: trunk/sc2/src/uqm/comm/comandr/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/comm/comandr/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/comm/comandr/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="comandr.c"
+uqm_HFILES="resinst.h strings.h"
Modified: trunk/sc2/src/uqm/comm/druuge/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/comm/druuge/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/comm/druuge/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="druugec.c"
+uqm_HFILES="resinst.h strings.h"
Modified: trunk/sc2/src/uqm/comm/ilwrath/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/comm/ilwrath/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/comm/ilwrath/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="ilwrathc.c"
+uqm_HFILES="resinst.h strings.h"
Modified: trunk/sc2/src/uqm/comm/melnorm/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/comm/melnorm/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/comm/melnorm/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="melnorm.c"
+uqm_HFILES="resinst.h strings.h"
Modified: trunk/sc2/src/uqm/comm/mycon/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/comm/mycon/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/comm/mycon/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="myconc.c"
+uqm_HFILES="resinst.h strings.h"
Modified: trunk/sc2/src/uqm/comm/orz/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/comm/orz/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/comm/orz/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="orzc.c"
+uqm_HFILES="resinst.h strings.h"
Modified: trunk/sc2/src/uqm/comm/pkunk/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/comm/pkunk/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/comm/pkunk/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="pkunkc.c"
+uqm_HFILES="resinst.h strings.h"
Modified: trunk/sc2/src/uqm/comm/rebel/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/comm/rebel/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/comm/rebel/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="rebel.c"
+uqm_HFILES="strings.h"
Modified: trunk/sc2/src/uqm/comm/shofixt/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/comm/shofixt/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/comm/shofixt/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="shofixt.c"
+uqm_HFILES="resinst.h strings.h"
Modified: trunk/sc2/src/uqm/comm/slyhome/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/comm/slyhome/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/comm/slyhome/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="slyhome.c"
+uqm_HFILES="resinst.h strings.h"
Modified: trunk/sc2/src/uqm/comm/slyland/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/comm/slyland/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/comm/slyland/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="slyland.c"
+uqm_HFILES="resinst.h strings.h"
Modified: trunk/sc2/src/uqm/comm/spahome/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/comm/spahome/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/comm/spahome/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="spahome.c"
+uqm_HFILES="strings.h"
Modified: trunk/sc2/src/uqm/comm/spathi/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/comm/spathi/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/comm/spathi/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="spathic.c"
+uqm_HFILES="resinst.h strings.h"
Modified: trunk/sc2/src/uqm/comm/starbas/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/comm/starbas/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/comm/starbas/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="starbas.c"
+uqm_HFILES="strings.h"
Modified: trunk/sc2/src/uqm/comm/supox/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/comm/supox/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/comm/supox/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="supoxc.c"
+uqm_HFILES="resinst.h strings.h"
Modified: trunk/sc2/src/uqm/comm/syreen/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/comm/syreen/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/comm/syreen/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="syreenc.c"
+uqm_HFILES="resinst.h strings.h"
Modified: trunk/sc2/src/uqm/comm/talkpet/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/comm/talkpet/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/comm/talkpet/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="talkpet.c"
+uqm_HFILES="resinst.h strings.h"
Modified: trunk/sc2/src/uqm/comm/thradd/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/comm/thradd/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/comm/thradd/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="thraddc.c"
+uqm_HFILES="resinst.h strings.h"
Modified: trunk/sc2/src/uqm/comm/umgah/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/comm/umgah/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/comm/umgah/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="umgahc.c"
+uqm_HFILES="resinst.h strings.h"
Modified: trunk/sc2/src/uqm/comm/urquan/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/comm/urquan/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/comm/urquan/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="urquanc.c"
+uqm_HFILES="resinst.h strings.h"
Modified: trunk/sc2/src/uqm/comm/utwig/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/comm/utwig/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/comm/utwig/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="utwigc.c"
+uqm_HFILES="resinst.h strings.h"
Modified: trunk/sc2/src/uqm/comm/vux/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/comm/vux/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/comm/vux/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="vuxc.c"
+uqm_HFILES="resinst.h strings.h"
Modified: trunk/sc2/src/uqm/comm/yehat/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/comm/yehat/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/comm/yehat/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="yehatc.c"
+uqm_HFILES="resinst.h strings.h"
Modified: trunk/sc2/src/uqm/comm/zoqfot/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/comm/zoqfot/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/comm/zoqfot/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="zoqfotc.c"
+uqm_HFILES="resinst.h strings.h"
Modified: trunk/sc2/src/uqm/planets/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/planets/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/planets/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -2,3 +2,6 @@
uqm_CFILES="calc.c cargo.c devices.c gentopo.c lander.c orbits.c
oval.c pl_stuff.c planets.c plangen.c pstarmap.c report.c
roster.c scan.c solarsys.c surface.c"
+uqm_HFILES="elemdata.h generate.h lander.h lifeform.h plandata.h planets.h
+ scan.h sundata.h"
+
Modified: trunk/sc2/src/uqm/planets/generate/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/planets/generate/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/planets/generate/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -3,3 +3,4 @@
gensam.c genshof.c gensly.c gensol.c genspa.c gensup.c gensyr.c
genthrad.c gentrap.c genutw.c genvault.c genvux.c genwreck.c
genyeh.c genzfpscout.c genzoq.c"
+uqm_HFILES="genall.h gendefault.h"
Modified: trunk/sc2/src/uqm/ships/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/ships/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/ships/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -2,3 +2,4 @@
lastbat melnorme mmrnmhrm mycon orz pkunk probe shofixti sis_ship
slylandr spathi supox syreen thradd umgah urquan utwig vux yehat
zoqfot"
+uqm_HFILES="ship.h"
Modified: trunk/sc2/src/uqm/ships/androsyn/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/ships/androsyn/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/ships/androsyn/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="androsyn.c"
+uqm_HFILES="androsyn.h icode.h resinst.h"
Modified: trunk/sc2/src/uqm/ships/arilou/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/ships/arilou/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/ships/arilou/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="arilou.c"
+uqm_HFILES="arilou.h icode.h resinst.h"
Modified: trunk/sc2/src/uqm/ships/blackurq/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/ships/blackurq/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/ships/blackurq/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="blackurq.c"
+uqm_HFILES="blackurq.h icode.h resinst.h"
Modified: trunk/sc2/src/uqm/ships/chenjesu/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/ships/chenjesu/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/ships/chenjesu/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="chenjesu.c"
+uqm_HFILES="chenjesu.h icode.h resinst.h"
Modified: trunk/sc2/src/uqm/ships/chmmr/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/ships/chmmr/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/ships/chmmr/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="chmmr.c"
+uqm_HFILES="chmmr.h icode.h resinst.h"
Modified: trunk/sc2/src/uqm/ships/druuge/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/ships/druuge/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/ships/druuge/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="druuge.c"
+uqm_HFILES="druuge.h icode.h resinst.h"
Modified: trunk/sc2/src/uqm/ships/human/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/ships/human/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/ships/human/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="human.c"
+uqm_HFILES="human.h icode.h resinst.h"
Modified: trunk/sc2/src/uqm/ships/ilwrath/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/ships/ilwrath/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/ships/ilwrath/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="ilwrath.c"
+uqm_HFILES="icode.h ilwrath.h resinst.h"
Modified: trunk/sc2/src/uqm/ships/lastbat/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/ships/lastbat/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/ships/lastbat/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="lastbat.c"
+uqm_HFILES="icode.h lastbat.h resinst.h"
Modified: trunk/sc2/src/uqm/ships/melnorme/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/ships/melnorme/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/ships/melnorme/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="melnorme.c"
+uqm_HFILES="icode.h melnorme.h resinst.h"
Modified: trunk/sc2/src/uqm/ships/mmrnmhrm/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/ships/mmrnmhrm/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/ships/mmrnmhrm/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="mmrnmhrm.c"
+uqm_HFILES="icode.h mmrnmhrm.h resinst.h"
Modified: trunk/sc2/src/uqm/ships/mycon/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/ships/mycon/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/ships/mycon/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="mycon.c"
+uqm_HFILES="icode.h mycon.h resinst.h"
Modified: trunk/sc2/src/uqm/ships/orz/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/ships/orz/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/ships/orz/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="orz.c"
+uqm_HFILES="icode.h orz.h resinst.h"
Modified: trunk/sc2/src/uqm/ships/pkunk/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/ships/pkunk/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/ships/pkunk/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="pkunk.c"
+uqm_HFILES="icode.h pkunk.h resinst.h"
Modified: trunk/sc2/src/uqm/ships/probe/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/ships/probe/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/ships/probe/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="probe.c"
+uqm_HFILES="icode.h probe.h resinst.h"
Modified: trunk/sc2/src/uqm/ships/shofixti/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/ships/shofixti/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/ships/shofixti/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="shofixti.c"
+uqm_HFILES="icode.h resinst.h shofixti.h"
Modified: trunk/sc2/src/uqm/ships/sis_ship/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/ships/sis_ship/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/ships/sis_ship/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="sis_ship.c"
+uqm_HFILES="icode.h resinst.h sis_ship.h"
Modified: trunk/sc2/src/uqm/ships/slylandr/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/ships/slylandr/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/ships/slylandr/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="slylandr.c"
+uqm_HFILES="icode.h resinst.h slylandr.h"
Modified: trunk/sc2/src/uqm/ships/spathi/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/ships/spathi/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/ships/spathi/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="spathi.c"
+uqm_HFILES="icode.h resinst.h spathi.h"
Modified: trunk/sc2/src/uqm/ships/supox/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/ships/supox/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/ships/supox/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="supox.c"
+uqm_HFILES="icode.h resinst.h supox.h"
Modified: trunk/sc2/src/uqm/ships/syreen/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/ships/syreen/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/ships/syreen/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="syreen.c"
+uqm_HFILES="icode.h resinst.h syreen.h"
Modified: trunk/sc2/src/uqm/ships/thradd/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/ships/thradd/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/ships/thradd/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="thradd.c"
+uqm_HFILES="icode.h resinst.h thradd.h"
Modified: trunk/sc2/src/uqm/ships/umgah/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/ships/umgah/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/ships/umgah/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="umgah.c"
+uqm_HFILES="icode.h resinst.h umgah.h"
Modified: trunk/sc2/src/uqm/ships/urquan/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/ships/urquan/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/ships/urquan/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="urquan.c"
+uqm_HFILES="icode.h resinst.h urquan.h"
Modified: trunk/sc2/src/uqm/ships/utwig/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/ships/utwig/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/ships/utwig/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="utwig.c"
+uqm_HFILES="icode.h resinst.h utwig.h"
Modified: trunk/sc2/src/uqm/ships/vux/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/ships/vux/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/ships/vux/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="vux.c"
+uqm_HFILES="icode.h resinst.h vux.h"
Modified: trunk/sc2/src/uqm/ships/yehat/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/ships/yehat/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/ships/yehat/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="yehat.c"
+uqm_HFILES="icode.h resinst.h yehat.h"
Modified: trunk/sc2/src/uqm/ships/zoqfot/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/ships/zoqfot/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/ships/zoqfot/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1 +1,2 @@
uqm_CFILES="zoqfot.c"
+uqm_HFILES="icode.h resinst.h zoqfot.h"
Modified: trunk/sc2/src/uqm/supermelee/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/supermelee/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/supermelee/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1,4 +1,5 @@
uqm_CFILES="buildpick.c loadmele.c melee.c meleesetup.c pickmele.c"
+uqm_HFILES="buildpick.h loadmele.h melee.h meleesetup.h meleeship.h pickmele.h"
if [ -n "$uqm_NETPLAY" ]; then
uqm_SUBDIRS="$uqm_SUBDIRS netplay"
fi
Modified: trunk/sc2/src/uqm/supermelee/netplay/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/supermelee/netplay/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/supermelee/netplay/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1,3 +1,4 @@
uqm_SUBDIRS="proto"
uqm_CFILES="checkbuf.c checksum.c crc.c netconnection.c netinput.c netmelee.c netmisc.c netoptions.c netrcv.c netsend.c netstate.c notify.c notifyall.c packet.c packethandlers.c packetsenders.c packetq.c"
+uqm_HFILES="checkbuf.h checksum.h crc.h netconnection.h netinput.h netmelee.h netmisc.h netoptions.h netplay.h netrcv.h netsend.h netstate.h notifyall.h notify.h packet.h packethandlers.h packetq.h packetsenders.h"
Modified: trunk/sc2/src/uqm/supermelee/netplay/proto/Makeinfo
===================================================================
--- trunk/sc2/src/uqm/supermelee/netplay/proto/Makeinfo 2011-07-16 19:56:22 UTC (rev 3650)
+++ trunk/sc2/src/uqm/supermelee/netplay/proto/Makeinfo 2011-07-17 09:04:26 UTC (rev 3651)
@@ -1,2 +1,2 @@
uqm_CFILES="npconfirm.c ready.c reset.c"
-
+uqm_HFILES="npconfirm.h ready.h reset.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <av...@us...> - 2011-07-16 19:56:28
|
Revision: 3650
http://sc2.svn.sourceforge.net/sc2/?rev=3650&view=rev
Author: avolkov
Date: 2011-07-16 19:56:22 +0000 (Sat, 16 Jul 2011)
Log Message:
-----------
Removed the remnants of the --music option; bug #1133
Modified Paths:
--------------
trunk/sc2/ChangeLog
trunk/sc2/doc/users/manual.txt
trunk/sc2/src/uqm.c
Modified: trunk/sc2/ChangeLog
===================================================================
--- trunk/sc2/ChangeLog 2011-07-16 19:27:13 UTC (rev 3649)
+++ trunk/sc2/ChangeLog 2011-07-16 19:56:22 UTC (rev 3650)
@@ -1,4 +1,5 @@
Changes towards version 0.8:
+- Removed the remnants of the --music option (bug #1133) - Alex
- Fixed flagship re-entering the inner system after an encounter in the
outer system, thus trapping the player (bug #1135) - Alex
- Fixed starmap fuel range circle shrinking (bug #1130) - Alex
Modified: trunk/sc2/doc/users/manual.txt
===================================================================
--- trunk/sc2/doc/users/manual.txt 2011-07-16 19:27:13 UTC (rev 3649)
+++ trunk/sc2/doc/users/manual.txt 2011-07-16 19:56:22 UTC (rev 3650)
@@ -134,15 +134,6 @@
Set speech volume (0-100). If set to 0, the game runs in 'no speech'
mode and the oscilloscope reacts to the music.
- -m 3do (or --music 3do)
-
-Use the 3DO remixed soundtrack for songs that were in fact remixed.
-The default.
-
- -m pc (or --music pc)
-
-Use the .MOD based PC soundtrack everywhere.
-
-q (or --audioquality)
Can be "high", "medium", or "low". Specifies how nice the audio
Modified: trunk/sc2/src/uqm.c
===================================================================
--- trunk/sc2/src/uqm.c 2011-07-16 19:27:13 UTC (rev 3649)
+++ trunk/sc2/src/uqm.c 2011-07-16 19:56:22 UTC (rev 3650)
@@ -707,7 +707,7 @@
#endif
};
-static const char *optString = "+r:foc:b:spC:n:?hM:S:T:m:q:ug:l:i:vwxk";
+static const char *optString = "+r:foc:b:spC:n:?hM:S:T:q:ug:l:i:vwxk";
static struct option longOptions[] =
{
{"res", 1, NULL, 'r'},
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <av...@us...> - 2011-07-16 19:27:19
|
Revision: 3649
http://sc2.svn.sourceforge.net/sc2/?rev=3649&view=rev
Author: avolkov
Date: 2011-07-16 19:27:13 +0000 (Sat, 16 Jul 2011)
Log Message:
-----------
Fixed flagship-planet IP collision regression introduced in r3384; bug #1135
Modified Paths:
--------------
trunk/sc2/ChangeLog
trunk/sc2/src/uqm/planets/solarsys.c
Modified: trunk/sc2/ChangeLog
===================================================================
--- trunk/sc2/ChangeLog 2011-07-16 16:26:57 UTC (rev 3648)
+++ trunk/sc2/ChangeLog 2011-07-16 19:27:13 UTC (rev 3649)
@@ -1,4 +1,6 @@
Changes towards version 0.8:
+- Fixed flagship re-entering the inner system after an encounter in the
+ outer system, thus trapping the player (bug #1135) - Alex
- Fixed starmap fuel range circle shrinking (bug #1130) - Alex
- Added gamma correction to the setup menu (bug #977) - Alex, Nic
- Refactor Melnorme comm code to make modding easier; step 1 (bug #1128),
Modified: trunk/sc2/src/uqm/planets/solarsys.c
===================================================================
--- trunk/sc2/src/uqm/planets/solarsys.c 2011-07-16 16:26:57 UTC (rev 3648)
+++ trunk/sc2/src/uqm/planets/solarsys.c 2011-07-16 19:27:13 UTC (rev 3649)
@@ -527,7 +527,7 @@
// Returns the planet with which the flagship is colliding
static PLANET_DESC *
-CheckIntersect (BOOLEAN just_checking)
+CheckIntersect (void)
{
COUNT i;
PLANET_DESC *pCurDesc;
@@ -618,16 +618,9 @@
continue;
}
- if (playerInInnerSystem ())
- { // Collision in the inner system (starts orbital)
- pSolarSysState->WaitIntersect = NewWaitPlanet;
- }
- else
- { // Going into an inner system
- // So there is now no existing collision
- if (!just_checking)
- pSolarSysState->WaitIntersect = 0;
- }
+ // Collision with a new planet/moon. This may cause a transition
+ // to an inner system or start an orbital view.
+ pSolarSysState->WaitIntersect = NewWaitPlanet;
return pCurDesc;
}
}
@@ -942,7 +935,7 @@
// See if we also intersect with another planet, and if we do,
// disable collisions comletely until we stop intersecting
// with any planet at all.
- CheckIntersect (TRUE);
+ CheckIntersect ();
if (pSolarSysState->WaitIntersect != outerPlanetWait)
pSolarSysState->WaitIntersect = (COUNT)~0;
}
@@ -998,7 +991,7 @@
if (GLOBAL (autopilot.x) == ~0 && GLOBAL (autopilot.y) == ~0)
{ // Not on autopilot -- may collide with a planet
- PLANET_DESC *planet = CheckIntersect (FALSE);
+ PLANET_DESC *planet = CheckIntersect ();
if (planet)
{ // Collision with a planet
if (playerInInnerSystem ())
@@ -1241,7 +1234,12 @@
DoMissions ();
// Figure out and note which planet/moon we just left, if any
- CheckIntersect (TRUE);
+ // This records any existing collision and prevents the ship
+ // from entering planets until a new collision occurs.
+ // TODO: this may need logic similar to one in leaveInnerSystem()
+ // for when the ship collides with more than one planet at
+ // the same time. While quite rare, it's still possible.
+ CheckIntersect ();
pSolarSysState->InIpFlight = TRUE;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <av...@us...> - 2011-07-16 16:27:04
|
Revision: 3648
http://sc2.svn.sourceforge.net/sc2/?rev=3648&view=rev
Author: avolkov
Date: 2011-07-16 16:26:57 +0000 (Sat, 16 Jul 2011)
Log Message:
-----------
Fix a type warning in sdl sound driver that could actually become a problem
Modified Paths:
--------------
trunk/sc2/src/libs/sound/mixer/sdl/audiodrv_sdl.c
Modified: trunk/sc2/src/libs/sound/mixer/sdl/audiodrv_sdl.c
===================================================================
--- trunk/sc2/src/libs/sound/mixer/sdl/audiodrv_sdl.c 2011-07-16 16:15:09 UTC (rev 3647)
+++ trunk/sc2/src/libs/sound/mixer/sdl/audiodrv_sdl.c 2011-07-16 16:26:57 UTC (rev 3648)
@@ -90,6 +90,8 @@
};
+static void audioCallback (void *userdata, Uint8 *stream, int len);
+
/*
* Initialization
*/
@@ -143,7 +145,7 @@
desired.format = AUDIO_S16SYS;
desired.channels = 2;
- desired.callback = mixer_MixChannels;
+ desired.callback = audioCallback;
log_add (log_Info, "Opening SDL audio device.");
if (SDL_OpenAudio (&desired, &obtained) < 0)
@@ -247,6 +249,11 @@
SDL_QuitSubSystem (SDL_INIT_AUDIO);
}
+static void
+audioCallback (void *userdata, Uint8 *stream, int len)
+{
+ mixer_MixChannels (userdata, stream, len);
+}
/*
* General
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <av...@us...> - 2011-07-16 16:15:15
|
Revision: 3647
http://sc2.svn.sourceforge.net/sc2/?rev=3647&view=rev
Author: avolkov
Date: 2011-07-16 16:15:09 +0000 (Sat, 16 Jul 2011)
Log Message:
-----------
Silence the obsessive compiler (missing initializer)
Modified Paths:
--------------
trunk/sc2/src/libs/sound/sfx.c
Modified: trunk/sc2/src/libs/sound/sfx.c
===================================================================
--- trunk/sc2/src/libs/sound/sfx.c 2011-07-15 16:09:12 UTC (rev 3646)
+++ trunk/sc2/src/libs/sound/sfx.c 2011-07-16 16:15:09 UTC (rev 3647)
@@ -29,7 +29,7 @@
static void CheckFinishedChannels (void);
-static const SoundPosition notPositional = {FALSE};
+static const SoundPosition notPositional = {FALSE, 0, 0};
void
PlayChannel (COUNT channel, SOUND snd, SoundPosition pos,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <av...@us...> - 2011-07-15 16:09:19
|
Revision: 3646
http://sc2.svn.sourceforge.net/sc2/?rev=3646&view=rev
Author: avolkov
Date: 2011-07-15 16:09:12 +0000 (Fri, 15 Jul 2011)
Log Message:
-----------
Fixed the starmap fuel range circle overflow; bug #1130; also cap the range circle at a sensible level to prevent further overflows
Modified Paths:
--------------
trunk/sc2/ChangeLog
trunk/sc2/src/uqm/planets/pstarmap.c
Modified: trunk/sc2/ChangeLog
===================================================================
--- trunk/sc2/ChangeLog 2011-07-14 21:36:36 UTC (rev 3645)
+++ trunk/sc2/ChangeLog 2011-07-15 16:09:12 UTC (rev 3646)
@@ -1,4 +1,5 @@
Changes towards version 0.8:
+- Fixed starmap fuel range circle shrinking (bug #1130) - Alex
- Added gamma correction to the setup menu (bug #977) - Alex, Nic
- Refactor Melnorme comm code to make modding easier; step 1 (bug #1128),
from Scott A. Colcord
Modified: trunk/sc2/src/uqm/planets/pstarmap.c
===================================================================
--- trunk/sc2/src/uqm/planets/pstarmap.c 2011-07-14 21:36:36 UTC (rev 3645)
+++ trunk/sc2/src/uqm/planets/pstarmap.c 2011-07-15 16:09:12 UTC (rev 3646)
@@ -68,18 +68,18 @@
#define MAP_FIT_X ((MAX_X_UNIVERSE + 1) / SIS_SCREEN_WIDTH + 1)
static inline COORD
-universeToDispx (COORD ux)
+universeToDispx (long ux)
{
- return signedDivWithError ((((long)ux - mapOrigin.x) << zoomLevel)
+ return signedDivWithError (((ux - mapOrigin.x) << zoomLevel)
* SIS_SCREEN_WIDTH, MAX_X_UNIVERSE + MAP_FIT_X)
+ ((SIS_SCREEN_WIDTH - 1) >> 1);
}
#define UNIVERSE_TO_DISPX(ux) universeToDispx(ux)
static inline COORD
-universeToDispy (COORD uy)
+universeToDispy (long uy)
{
- return signedDivWithError ((((long)mapOrigin.y - uy) << zoomLevel)
+ return signedDivWithError (((mapOrigin.y - uy) << zoomLevel)
* SIS_SCREEN_HEIGHT, MAX_Y_UNIVERSE + 2)
+ ((SIS_SCREEN_HEIGHT - 1) >> 1);
}
@@ -343,6 +343,7 @@
}
ClearDrawable ();
+ // Draw the fuel range circle
if (race_update == 0
&& which_space < 2
&& (diameter = (long)GLOBAL_SIS (FuelOnBoard) << 1))
@@ -357,6 +358,10 @@
r.corner.y = LOGY_TO_UNIVERSE (GLOBAL_SIS (log_y));
}
+ // Cap the diameter to a sane range
+ if (diameter > MAX_X_UNIVERSE * 4)
+ diameter = MAX_X_UNIVERSE * 4;
+
r.extent.width = UNIVERSE_TO_DISPX (diameter)
- UNIVERSE_TO_DISPX (0);
if (r.extent.width < 0)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <av...@us...> - 2011-07-14 21:36:43
|
Revision: 3645
http://sc2.svn.sourceforge.net/sc2/?rev=3645&view=rev
Author: avolkov
Date: 2011-07-14 21:36:36 +0000 (Thu, 14 Jul 2011)
Log Message:
-----------
Added gamma correction option to the setup menu; bug #977; some work from Nic
Modified Paths:
--------------
trunk/sc2/ChangeLog
trunk/sc2/content/base/ui/setupmenu.txt
trunk/sc2/src/libs/graphics/gfx_common.h
trunk/sc2/src/libs/graphics/sdl/sdl_common.c
trunk/sc2/src/options.c
trunk/sc2/src/options.h
trunk/sc2/src/uqm/setupmenu.c
trunk/sc2/src/uqm/setupmenu.h
trunk/sc2/src/uqm.c
Modified: trunk/sc2/ChangeLog
===================================================================
--- trunk/sc2/ChangeLog 2011-07-13 17:29:42 UTC (rev 3644)
+++ trunk/sc2/ChangeLog 2011-07-14 21:36:36 UTC (rev 3645)
@@ -1,4 +1,5 @@
Changes towards version 0.8:
+- Added gamma correction to the setup menu (bug #977) - Alex, Nic
- Refactor Melnorme comm code to make modding easier; step 1 (bug #1128),
from Scott A. Colcord
- Added aspect ratio option to the setup menu - Alex
Modified: trunk/sc2/content/base/ui/setupmenu.txt
===================================================================
--- trunk/sc2/content/base/ui/setupmenu.txt 2011-07-13 17:29:42 UTC (rev 3644)
+++ trunk/sc2/content/base/ui/setupmenu.txt 2011-07-14 21:36:36 UTC (rev 3645)
@@ -455,6 +455,7 @@
Music Volume
SFX Volume
Speech Volume
+Gamma Correction
#(SLIDER_0_DESC)
Sets the music volume.
@@ -465,6 +466,10 @@
#(SLIDER_2_DESC)
Sets the speech volume.
+#(SLIDER_3_DESC)
+Sets the gamma correction.
+May not work on all hardware.
+
#(BUTTONS)
Quit Setup Menu
Return to Main Menu
Modified: trunk/sc2/src/libs/graphics/gfx_common.h
===================================================================
--- trunk/sc2/src/libs/graphics/gfx_common.h 2011-07-13 17:29:42 UTC (rev 3644)
+++ trunk/sc2/src/libs/graphics/gfx_common.h 2011-07-14 21:36:36 UTC (rev 3645)
@@ -67,7 +67,7 @@
int TFB_ReInitGraphics (int driver, int flags, int width, int height);
void TFB_UninitGraphics (void);
void TFB_ProcessEvents (void);
-void TFB_SetGamma (float gamma);
+bool TFB_SetGamma (float gamma);
void TFB_UploadTransitionScreen (void);
// This function should not be called directly
void TFB_SwapBuffers (int force_full_redraw);
Modified: trunk/sc2/src/libs/graphics/sdl/sdl_common.c
===================================================================
--- trunk/sc2/src/libs/graphics/sdl/sdl_common.c 2011-07-13 17:29:42 UTC (rev 3644)
+++ trunk/sc2/src/libs/graphics/sdl/sdl_common.c 2011-07-14 21:36:36 UTC (rev 3645)
@@ -592,16 +592,8 @@
#endif
}
-void
+bool
TFB_SetGamma (float gamma)
{
- if (SDL_SetGamma (gamma, gamma, gamma) == -1)
- {
- log_add (log_Warning, "Unable to set gamma correction.");
- }
- else
- {
- log_add (log_Info, "Gamma correction set to %1.4f.", gamma);
- }
+ return (SDL_SetGamma (gamma, gamma, gamma) == 0);
}
-
Modified: trunk/sc2/src/options.c
===================================================================
--- trunk/sc2/src/options.c 2011-07-13 17:29:42 UTC (rev 3644)
+++ trunk/sc2/src/options.c 2011-07-14 21:36:36 UTC (rev 3645)
@@ -58,6 +58,9 @@
BOOLEAN optSubtitles;
BOOLEAN optStereoSFX;
BOOLEAN optKeepAspectRatio;
+
+float optGamma;
+
uio_DirHandle *contentDir;
uio_DirHandle *configDir;
uio_DirHandle *saveDir;
@@ -584,3 +587,14 @@
}
}
}
+
+bool
+setGammaCorrection (float gamma)
+{
+ bool set = TFB_SetGamma (gamma);
+ if (set)
+ log_add (log_Info, "Gamma correction set to %.4f.", gamma);
+ else
+ log_add (log_Warning, "Unable to set gamma correction.");
+ return set;
+}
Modified: trunk/sc2/src/options.h
===================================================================
--- trunk/sc2/src/options.h 2011-07-13 17:29:42 UTC (rev 3644)
+++ trunk/sc2/src/options.h 2011-07-14 21:36:36 UTC (rev 3645)
@@ -45,6 +45,9 @@
extern BOOLEAN optStereoSFX;
extern BOOLEAN optKeepAspectRatio;
+#define GAMMA_SCALE 1000
+extern float optGamma;
+
extern uio_DirHandle *contentDir;
extern uio_DirHandle *configDir;
extern uio_DirHandle *saveDir;
@@ -76,5 +79,7 @@
BOOLEAN loadAddon (const char *addon);
int loadIndices (uio_DirHandle *baseDir);
+bool setGammaCorrection (float gamma);
+
#endif
Modified: trunk/sc2/src/uqm/setupmenu.c
===================================================================
--- trunk/sc2/src/uqm/setupmenu.c 2011-07-13 17:29:42 UTC (rev 3644)
+++ trunk/sc2/src/uqm/setupmenu.c 2011-07-14 21:36:36 UTC (rev 3645)
@@ -37,7 +37,9 @@
#include "libs/memlib.h"
#include "resinst.h"
#include "nameref.h"
+#include <math.h>
+
static STRING SetupTab;
typedef struct setup_menu_state {
@@ -74,7 +76,7 @@
#define MENU_COUNT 8
#define CHOICE_COUNT 24
-#define SLIDER_COUNT 3
+#define SLIDER_COUNT 4
#define BUTTON_COUNT 10
#define LABEL_COUNT 4
#define TEXTENTRY_COUNT 1
@@ -119,6 +121,7 @@
(WIDGET *)(&choices[0]),
(WIDGET *)(&choices[23]),
(WIDGET *)(&choices[10]),
+ (WIDGET *)(&sliders[3]),
(WIDGET *)(&choices[2]),
(WIDGET *)(&choices[3]),
(WIDGET *)(&buttons[1]),
@@ -202,6 +205,18 @@
{NULL, 0}
};
+// Start with reasonable gamma bounds. These will get updated
+// as we find out the actual bounds.
+static float minGamma = 0.4f;
+static float maxGamma = 2.5f;
+// The gamma slider uses an exponential curve
+// We use y = e^(2.1972*(x-1)) curve to give us a nice spread of
+// gamma values 0.11 < g < 9.0 centered at g=1.0
+#define GAMMA_CURVE_B 2.1972f
+static float minGammaX;
+static float maxGammaX;
+
+
static int
quit_main_menu (WIDGET *self, int event)
{
@@ -405,6 +420,7 @@
sliders[0].value = opts.musicvol;
sliders[1].value = opts.sfxvol;
sliders[2].value = opts.speechvol;
+ sliders[3].value = opts.gamma;
}
static void
@@ -438,6 +454,7 @@
opts.musicvol = sliders[0].value;
opts.sfxvol = sliders[1].value;
opts.speechvol = sliders[2].value;
+ opts.gamma = sliders[3].value;
SetGlobalOptions (&opts);
}
@@ -594,7 +611,136 @@
return TRUE; // event handled
}
+static inline float
+gammaCurve (float x)
+{
+ // The slider uses an exponential curve
+ return exp ((x - 1) * GAMMA_CURVE_B);
+}
+
+static inline float
+solveGammaCurve (float y)
+{
+ return log (y) / GAMMA_CURVE_B + 1;
+}
+
+static int
+gammaToSlider (float gamma)
+{
+ const float x = solveGammaCurve (gamma);
+ const float step = (maxGammaX - minGammaX) / 100;
+ return (int) ((x - minGammaX) / step + 0.5);
+}
+
+static float
+sliderToGamma (int value)
+{
+ const float step = (maxGammaX - minGammaX) / 100;
+ const float x = minGammaX + step * value;
+ const float g = gammaCurve (x);
+ // report any value that is close enough as 1.0
+ return (fabs (g - 1.0f) < 0.001f) ? 1.0f : g;
+}
+
static void
+updateGammaBounds (bool useUpper)
+{
+ float g, x;
+ int slider;
+
+ // The slider uses an exponential curve.
+ // Calculate where on the curve the min and max gamma values are
+ minGammaX = solveGammaCurve (minGamma);
+ maxGammaX = solveGammaCurve (maxGamma);
+
+ // We have 100 discrete steps through the range, so the slider may
+ // skip over a 1.0 gamma. We need to ensure that there always is
+ // a 1.0 on the slider by tweaking the range (expanding/contracting).
+ slider = gammaToSlider (1.0f);
+ g = sliderToGamma (slider);
+ if (g == 1.0f)
+ return; // no adjustment needed
+
+ x = solveGammaCurve (g);
+ if (useUpper)
+ { // Move the upper bound up or down to land on 1.0
+ const float d = (x - 1.0f) * 100 / slider;
+ maxGammaX -= d;
+ maxGamma = gammaCurve (maxGammaX);
+ }
+ else
+ { // Move the lower bound up or down to land on 1.0
+ const float d = (x - 1.0f) * 100 / (100 - slider);
+ minGammaX -= d;
+ minGamma = gammaCurve (minGammaX);
+ }
+}
+
+static int
+gamma_HandleEventSlider (WIDGET *_self, int event)
+{
+ WIDGET_SLIDER *self = (WIDGET_SLIDER *)_self;
+ int prevValue = self->value;
+ float gamma;
+ bool set;
+
+ switch (event)
+ {
+ case WIDGET_EVENT_LEFT:
+ self->value -= self->step;
+ break;
+ case WIDGET_EVENT_RIGHT:
+ self->value += self->step;
+ break;
+ default:
+ return FALSE;
+ }
+
+ // Limit the slider to values accepted by gfx subsys
+ gamma = sliderToGamma (self->value);
+ set = TFB_SetGamma (gamma);
+ if (!set)
+ { // revert
+ self->value = prevValue;
+ gamma = sliderToGamma (self->value);
+ }
+
+ // Grow or shrink the range based on accepted values
+ if (gamma < minGamma || (!set && event == WIDGET_EVENT_LEFT))
+ {
+ minGamma = gamma;
+ updateGammaBounds (true);
+ // at the lowest end
+ self->value = 0;
+ }
+ else if (gamma > maxGamma || (!set && event == WIDGET_EVENT_RIGHT))
+ {
+ maxGamma = gamma;
+ updateGammaBounds (false);
+ // at the highest end
+ self->value = 100;
+ }
+ return TRUE;
+}
+
+static void
+gamma_DrawValue (WIDGET_SLIDER *self, int x, int y)
+{
+ TEXT t;
+ char buf[16];
+ float gamma = sliderToGamma (self->value);
+ snprintf (buf, sizeof buf, "%.4f", gamma);
+
+ t.baseline.x = x;
+ t.baseline.y = y;
+ t.align = ALIGN_CENTER;
+ t.CharCount = ~0;
+ t.pStr = buf;
+
+ font_DrawText (&t);
+}
+
+static void
rebind_control (WIDGET_CONTROLENTRY *widget)
{
int template = choices[20].selected;
@@ -804,6 +950,10 @@
sliders[i].tooltip[1] = "";
sliders[i].tooltip[2] = "";
}
+ // gamma is a special case
+ sliders[3].step = 1;
+ sliders[3].handleEvent = gamma_HandleEventSlider;
+ sliders[3].draw_value = gamma_DrawValue;
for (i = 0; i < SLIDER_COUNT; i++)
{
@@ -1080,6 +1230,8 @@
void
GetGlobalOptions (GLOBALOPTS *opts)
{
+ bool whichBound;
+
if (GfxFlags & TFB_GFXFLAGS_SCALE_BILINEAR)
{
opts->scaler = OPTVAL_BILINEAR_SCALE;
@@ -1227,13 +1379,22 @@
}
}
+ whichBound = (optGamma < maxGamma);
+ // The option supplied by the user may be beyond our starting range
+ // but valid nonetheless. We need to account for that.
+ if (optGamma <= minGamma)
+ minGamma = optGamma - 0.03f;
+ else if (optGamma >= maxGamma)
+ maxGamma = optGamma + 0.3f;
+ updateGammaBounds (whichBound);
+ opts->gamma = gammaToSlider (optGamma);
+
opts->player1 = PlayerControls[0];
opts->player2 = PlayerControls[1];
opts->musicvol = (((int)(musicVolumeScale * 100.0f) + 2) / 5) * 5;
opts->sfxvol = (((int)(sfxVolumeScale * 100.0f) + 2) / 5) * 5;
opts->speechvol = (((int)(speechVolumeScale * 100.0f) + 2) / 5) * 5;
-
}
void
@@ -1336,6 +1497,14 @@
FlushGraphics ();
InitVideoPlayer (TRUE);
}
+
+ // Avoid setting gamma when it is not necessary
+ if (optGamma != 1.0f || sliderToGamma (opts->gamma) != 1.0f)
+ {
+ optGamma = sliderToGamma (opts->gamma);
+ setGammaCorrection (optGamma);
+ }
+
optSubtitles = (opts->subtitles == OPTVAL_ENABLED) ? TRUE : FALSE;
// optWhichMusic = (opts->music == OPTVAL_3DO) ? OPT_3DO : OPT_PC;
optWhichMenu = (opts->menu == OPTVAL_3DO) ? OPT_3DO : OPT_PC;
@@ -1366,6 +1535,7 @@
res_PutBoolean ("config.positionalsfx", opts->stereo == OPTVAL_ENABLED);
res_PutBoolean ("config.pulseshield", opts->shield == OPTVAL_3DO);
res_PutBoolean ("config.keepaspectratio", opts->keepaspect == OPTVAL_ENABLED);
+ res_PutInteger ("config.gamma", (int) (optGamma * GAMMA_SCALE + 0.5));
res_PutInteger ("config.player1control", opts->player1);
res_PutInteger ("config.player2control", opts->player2);
Modified: trunk/sc2/src/uqm/setupmenu.h
===================================================================
--- trunk/sc2/src/uqm/setupmenu.h 2011-07-13 17:29:42 UTC (rev 3644)
+++ trunk/sc2/src/uqm/setupmenu.h 2011-07-14 21:36:36 UTC (rev 3645)
@@ -80,6 +80,7 @@
OPT_CONSOLETYPE menu, text, cscan, scroll, intro, meleezoom, shield;
CONTROL_TEMPLATE player1, player2;
int speechvol, musicvol, sfxvol;
+ int gamma;
} GLOBALOPTS;
void SetupMenu (void);
Modified: trunk/sc2/src/uqm.c
===================================================================
--- trunk/sc2/src/uqm.c 2011-07-13 17:29:42 UTC (rev 3644)
+++ trunk/sc2/src/uqm.c 2011-07-14 21:36:36 UTC (rev 3645)
@@ -243,7 +243,7 @@
INIT_CONFIG_OPTION( scaler, 0 ),
INIT_CONFIG_OPTION( showFps, false ),
INIT_CONFIG_OPTION( keepAspectRatio, false ),
- INIT_CONFIG_OPTION( gamma, 0.0f ),
+ INIT_CONFIG_OPTION( gamma, 1.0f ),
INIT_CONFIG_OPTION( soundDriver, audio_DRIVER_MIXSDL ),
INIT_CONFIG_OPTION( soundQuality, audio_QUALITY_MEDIUM ),
INIT_CONFIG_OPTION( use3doMusic, true ),
@@ -418,8 +418,11 @@
gfxFlags |= TFB_GFXFLAGS_SHOWFPS;
TFB_InitGraphics (gfxDriver, gfxFlags, options.resolution.width,
options.resolution.height);
- if (options.gamma.set)
- TFB_SetGamma (options.gamma.value);
+ if (options.gamma.set && setGammaCorrection (options.gamma.value))
+ optGamma = options.gamma.value;
+ else
+ optGamma = 1.0f; // failed or default
+
InitColorMaps ();
init_communication ();
/* TODO: Once threading is gone, restore initAudio here.
@@ -557,6 +560,25 @@
option->set = true;
}
+static void
+getGammaConfigValue (struct float_option *option, const char *config_val)
+{
+ int val;
+
+ if (option->set || !res_IsInteger (config_val))
+ return;
+
+ val = res_GetInteger (config_val);
+ // gamma config option is a fixed-point number
+ // ignore ridiculously out-of-range values
+ if (val < (int)(0.03 * GAMMA_SCALE) || val > (int)(9.9 * GAMMA_SCALE))
+ return;
+ option->value = val / (float)GAMMA_SCALE;
+ // avoid setting gamma when not necessary
+ if (option->value != 1.0f)
+ option->set = true;
+}
+
static bool
getListConfigValue (struct int_option *option, const char *config_val,
const struct option_list_value *list)
@@ -605,6 +627,7 @@
getBoolConfigValue (&options->scanlines, "config.scanlines");
getBoolConfigValue (&options->showFps, "config.showfps");
getBoolConfigValue (&options->keepAspectRatio, "config.keepaspectratio");
+ getGammaConfigValue (&options->gamma, "config.gamma");
getBoolConfigValue (&options->subtitles, "config.subtitles");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <av...@us...> - 2011-07-13 17:29:49
|
Revision: 3644
http://sc2.svn.sourceforge.net/sc2/?rev=3644&view=rev
Author: avolkov
Date: 2011-07-13 17:29:42 +0000 (Wed, 13 Jul 2011)
Log Message:
-----------
Refactor Melnorme comm code to make modding easier, step 1; bug #1128; from Scott A. Colcord
Modified Paths:
--------------
trunk/sc2/ChangeLog
trunk/sc2/src/uqm/comm/melnorm/melnorm.c
trunk/sc2/src/uqm/globdata.h
Modified: trunk/sc2/ChangeLog
===================================================================
--- trunk/sc2/ChangeLog 2011-07-09 21:52:21 UTC (rev 3643)
+++ trunk/sc2/ChangeLog 2011-07-13 17:29:42 UTC (rev 3644)
@@ -1,4 +1,6 @@
Changes towards version 0.8:
+- Refactor Melnorme comm code to make modding easier; step 1 (bug #1128),
+ from Scott A. Colcord
- Added aspect ratio option to the setup menu - Alex
- Added speech option which controls loading of 3dovoice addon (no need
to set speech volume to 0 anymore) - Alex
Modified: trunk/sc2/src/uqm/comm/melnorm/melnorm.c
===================================================================
--- trunk/sc2/src/uqm/comm/melnorm/melnorm.c 2011-07-09 21:52:21 UTC (rev 3643)
+++ trunk/sc2/src/uqm/comm/melnorm/melnorm.c 2011-07-13 17:29:42 UTC (rev 3644)
@@ -34,11 +34,6 @@
#include "uqm/sis.h"
-#define NUM_HISTORY_ITEMS 9
-#define NUM_EVENT_ITEMS 8
-#define NUM_ALIEN_RACE_ITEMS 16
-#define NUM_TECH_ITEMS 13
-
static const NUMBER_SPEECH_DESC melnorme_numbers_english;
static LOCDATA melnorme_desc =
@@ -201,6 +196,294 @@
}
};
+#define ARRAY_SIZE(array) (sizeof(array) / sizeof (*array))
+
+
+//////////////Technology System///////////////////////
+// This section deals with enabling and checking for
+// various technologies. It should probably be
+// migrated to its own file.
+
+// Identifiers for the various technologies
+typedef enum
+{
+ TECH_MODULE_BLASTER,
+ TECH_LANDER_SPEED,
+ TECH_MODULE_ANTIMISSILE,
+ TECH_LANDER_SHIELD_BIO,
+ TECH_LANDER_CARGO,
+ TECH_MODULE_BIGFUELTANK,
+ TECH_LANDER_RAPIDFIRE,
+ TECH_LANDER_SHIELD_QUAKE,
+ TECH_MODULE_TRACKING,
+ TECH_LANDER_SHIELD_LIGHTNING,
+ TECH_LANDER_SHIELD_HEAT,
+ TECH_MODULE_CANNON,
+ TECH_MODULE_FURNACE,
+} TechId_t;
+
+// Group the technologies into three subtypes
+typedef enum
+{
+ TECH_TYPE_MODULE, // Flagship modules
+ // subtype = moduleId, info = cost
+ // Cost will be scaled by MODULE_COST_SCALE.
+ TECH_TYPE_LANDER_SHIELD, // Lander shield enhancements
+ // subtype = disaster type, info = unused
+ TECH_TYPE_STATE // Other game state changes
+ // subtype = stateId, info = state value
+} TechType_t;
+
+
+// Define the information specifying a particular technology
+typedef struct
+{
+ TechId_t id; // ID of the technology
+ TechType_t type; // Type of the technology
+ int subtype; // Subtype of the technology
+ int info; // Supplemental information
+} TechData;
+
+
+// A table of the available technologies.
+// This should really be an associative map of TechIds to tech data records,
+// but implementing that would be excessive.
+static const TechData tech_data_table[] =
+{
+ // Tech ID Tech Type, Supplemental info
+ { TECH_MODULE_BLASTER, TECH_TYPE_MODULE, BLASTER_WEAPON, 4000 },
+ { TECH_LANDER_SPEED, TECH_TYPE_STATE, IMPROVED_LANDER_SPEED, 1 },
+ { TECH_MODULE_ANTIMISSILE, TECH_TYPE_MODULE, ANTIMISSILE_DEFENSE, 4000 },
+ { TECH_LANDER_SHIELD_BIO, TECH_TYPE_LANDER_SHIELD, BIOLOGICAL_DISASTER, -1 },
+ { TECH_LANDER_CARGO, TECH_TYPE_STATE, IMPROVED_LANDER_CARGO, 1 },
+ { TECH_MODULE_BIGFUELTANK, TECH_TYPE_MODULE, HIGHEFF_FUELSYS, 1000 },
+ { TECH_LANDER_RAPIDFIRE, TECH_TYPE_STATE, IMPROVED_LANDER_SHOT, 1 },
+ { TECH_LANDER_SHIELD_QUAKE, TECH_TYPE_LANDER_SHIELD, EARTHQUAKE_DISASTER, -1 },
+ { TECH_MODULE_TRACKING, TECH_TYPE_MODULE, TRACKING_SYSTEM, 5000 },
+ { TECH_LANDER_SHIELD_LIGHTNING, TECH_TYPE_LANDER_SHIELD, LIGHTNING_DISASTER, -1 },
+ { TECH_LANDER_SHIELD_HEAT, TECH_TYPE_LANDER_SHIELD, LAVASPOT_DISASTER, -1 },
+ { TECH_MODULE_CANNON, TECH_TYPE_MODULE, CANNON_WEAPON, 6000 },
+ { TECH_MODULE_FURNACE, TECH_TYPE_MODULE, SHIVA_FURNACE, 4000 },
+};
+const size_t NUM_TECHNOLOGIES = ARRAY_SIZE (tech_data_table);
+
+// Lookup function to get the data for a particular tech
+static const TechData*
+GetTechData (TechId_t techId)
+{
+ size_t i = 0;
+ for (i = 0; i < NUM_TECHNOLOGIES; ++i)
+ {
+ if (tech_data_table[i].id == techId)
+ return &tech_data_table[i];
+ }
+ return NULL;
+}
+
+
+// We have to explicitly switch on the state ID because the xxx_GAME_STATE
+// macros use preprocessor stringizing.
+static bool
+HasStateTech (int stateId)
+{
+ switch (stateId)
+ {
+ case IMPROVED_LANDER_SPEED:
+ return GET_GAME_STATE (IMPROVED_LANDER_SPEED);
+ case IMPROVED_LANDER_CARGO:
+ return GET_GAME_STATE (IMPROVED_LANDER_CARGO);
+ case IMPROVED_LANDER_SHOT:
+ return GET_GAME_STATE (IMPROVED_LANDER_SHOT);
+ }
+ return false;
+}
+
+static void
+GrantStateTech (int stateId, BYTE value)
+{
+ switch (stateId)
+ {
+ case IMPROVED_LANDER_SPEED:
+ SET_GAME_STATE (IMPROVED_LANDER_SPEED, value);
+ return;
+ case IMPROVED_LANDER_CARGO:
+ SET_GAME_STATE (IMPROVED_LANDER_CARGO, value);
+ return;
+ case IMPROVED_LANDER_SHOT:
+ SET_GAME_STATE (IMPROVED_LANDER_SHOT, value);
+ return;
+ }
+}
+
+static bool
+HasTech (TechId_t techId)
+{
+ const TechData* techData = GetTechData (techId);
+ if (!techData)
+ return false;
+
+ switch (techData->type)
+ {
+ case TECH_TYPE_MODULE:
+ return GLOBAL (ModuleCost[techData->subtype]) != 0;
+ case TECH_TYPE_LANDER_SHIELD:
+ return (GET_GAME_STATE (LANDER_SHIELDS) & (1 << techData->subtype)) != 0;
+ case TECH_TYPE_STATE:
+ return HasStateTech (techData->subtype);
+ }
+ return false;
+}
+
+static void
+GrantTech (TechId_t techId)
+{
+ const TechData* techData = GetTechData (techId);
+ if (!techData)
+ return;
+
+ switch (techData->type)
+ {
+ case TECH_TYPE_MODULE:
+ GLOBAL (ModuleCost[techData->subtype]) = techData->info / MODULE_COST_SCALE;
+ return;
+ case TECH_TYPE_LANDER_SHIELD:
+ {
+ COUNT state = GET_GAME_STATE (LANDER_SHIELDS) | (1 << techData->subtype);
+ SET_GAME_STATE (LANDER_SHIELDS, state);
+ return;
+ }
+ case TECH_TYPE_STATE:
+ GrantStateTech (techData->subtype, techData->info);
+ return;
+ }
+}
+
+
+////////////Melnorme Sales System///////////
+// This section contains code related to Melnorme sales
+
+// Many of the conversation lines in strings.h fall into groups
+// of sequential responses. These structures allow those
+// responses to be interated through.
+static const int ok_buy_event_lines[] =
+{
+ OK_BUY_EVENT_1, OK_BUY_EVENT_2, OK_BUY_EVENT_3, OK_BUY_EVENT_4,
+ OK_BUY_EVENT_5, OK_BUY_EVENT_6, OK_BUY_EVENT_7, OK_BUY_EVENT_8
+};
+const size_t NUM_EVENT_ITEMS = ARRAY_SIZE (ok_buy_event_lines);
+
+static const int ok_buy_alien_race_lines[] =
+{
+ OK_BUY_ALIEN_RACE_1, OK_BUY_ALIEN_RACE_2, OK_BUY_ALIEN_RACE_3,
+ OK_BUY_ALIEN_RACE_4, OK_BUY_ALIEN_RACE_5, OK_BUY_ALIEN_RACE_6,
+ OK_BUY_ALIEN_RACE_7, OK_BUY_ALIEN_RACE_8, OK_BUY_ALIEN_RACE_9,
+ OK_BUY_ALIEN_RACE_10, OK_BUY_ALIEN_RACE_11, OK_BUY_ALIEN_RACE_12,
+ OK_BUY_ALIEN_RACE_13, OK_BUY_ALIEN_RACE_14, OK_BUY_ALIEN_RACE_15,
+ OK_BUY_ALIEN_RACE_16
+};
+const size_t NUM_ALIEN_RACE_ITEMS = ARRAY_SIZE (ok_buy_alien_race_lines);
+
+static const int ok_buy_history_lines[] =
+{
+ OK_BUY_HISTORY_1, OK_BUY_HISTORY_2, OK_BUY_HISTORY_3,
+ OK_BUY_HISTORY_4, OK_BUY_HISTORY_5, OK_BUY_HISTORY_6,
+ OK_BUY_HISTORY_7, OK_BUY_HISTORY_8, OK_BUY_HISTORY_9
+};
+const size_t NUM_HISTORY_ITEMS = ARRAY_SIZE (ok_buy_history_lines);
+
+static const int hello_and_down_to_business_lines[] =
+{
+ HELLO_AND_DOWN_TO_BUSINESS_1, HELLO_AND_DOWN_TO_BUSINESS_2,
+ HELLO_AND_DOWN_TO_BUSINESS_3, HELLO_AND_DOWN_TO_BUSINESS_4,
+ HELLO_AND_DOWN_TO_BUSINESS_5, HELLO_AND_DOWN_TO_BUSINESS_6,
+ HELLO_AND_DOWN_TO_BUSINESS_7, HELLO_AND_DOWN_TO_BUSINESS_8,
+ HELLO_AND_DOWN_TO_BUSINESS_9, HELLO_AND_DOWN_TO_BUSINESS_10
+};
+const size_t NUM_HELLO_LINES = ARRAY_SIZE (hello_and_down_to_business_lines);
+
+static const int rescue_lines[] =
+{
+ RESCUE_EXPLANATION, RESCUE_AGAIN_1, RESCUE_AGAIN_2,
+ RESCUE_AGAIN_3, RESCUE_AGAIN_4, RESCUE_AGAIN_5
+};
+const size_t NUM_RESCUE_LINES = ARRAY_SIZE (rescue_lines);
+
+// How many lines are available in the given array?
+static size_t
+GetNumLines (const int array[])
+{
+ if (array == ok_buy_event_lines)
+ return NUM_EVENT_ITEMS;
+ else if (array == ok_buy_alien_race_lines)
+ return NUM_ALIEN_RACE_ITEMS;
+ else if (array == ok_buy_history_lines)
+ return NUM_HISTORY_ITEMS;
+ else if (array == hello_and_down_to_business_lines)
+ return NUM_HELLO_LINES;
+ else if (array == rescue_lines)
+ return NUM_RESCUE_LINES;
+ return 0;
+}
+
+// Get the line, with range checking.
+// Returns the last line if the desired one is out of range.
+static int
+GetLineSafe (const int array[], size_t linenum)
+{
+ const size_t array_size = GetNumLines (array);
+ assert (array_size > 0);
+ if (linenum >= array_size)
+ linenum = array_size - 1;
+ return array[linenum];
+}
+
+// Data structure to hold the Melnorme's info on a technology
+typedef struct
+{
+ TechId_t techId; // ID of technology
+ int price; // Melnorme's price to sell
+ int sale_line; // Sales pitch line ID
+ int sold_line; // Post-sale line ID
+} TechSaleData;
+
+// Right now, all techs have the same price.
+#define TECHPRICE (75 * BIO_CREDIT_VALUE)
+
+static const TechSaleData tech_sale_catalog[] =
+{
+ { TECH_MODULE_BLASTER, TECHPRICE, NEW_TECH_1, OK_BUY_NEW_TECH_1 },
+ { TECH_LANDER_SPEED, TECHPRICE, NEW_TECH_2, OK_BUY_NEW_TECH_2 },
+ { TECH_MODULE_ANTIMISSILE, TECHPRICE, NEW_TECH_3, OK_BUY_NEW_TECH_3 },
+ { TECH_LANDER_SHIELD_BIO, TECHPRICE, NEW_TECH_4, OK_BUY_NEW_TECH_4 },
+ { TECH_LANDER_CARGO, TECHPRICE, NEW_TECH_5, OK_BUY_NEW_TECH_5 },
+ { TECH_MODULE_BIGFUELTANK, TECHPRICE, NEW_TECH_6, OK_BUY_NEW_TECH_6 },
+ { TECH_LANDER_RAPIDFIRE, TECHPRICE, NEW_TECH_7, OK_BUY_NEW_TECH_7 },
+ { TECH_LANDER_SHIELD_QUAKE, TECHPRICE, NEW_TECH_8, OK_BUY_NEW_TECH_8 },
+ { TECH_MODULE_TRACKING, TECHPRICE, NEW_TECH_9, OK_BUY_NEW_TECH_9 },
+ { TECH_LANDER_SHIELD_LIGHTNING, TECHPRICE, NEW_TECH_10, OK_BUY_NEW_TECH_10 },
+ { TECH_LANDER_SHIELD_HEAT, TECHPRICE, NEW_TECH_11, OK_BUY_NEW_TECH_11 },
+ { TECH_MODULE_CANNON, TECHPRICE, NEW_TECH_12, OK_BUY_NEW_TECH_12 },
+ { TECH_MODULE_FURNACE, TECHPRICE, NEW_TECH_13, OK_BUY_NEW_TECH_13 },
+};
+const size_t NUM_TECH_ITEMS = ARRAY_SIZE (tech_sale_catalog);
+
+// Return the next tech for sale that the player doesn't already have.
+// Returns NULL if the player has all the techs.
+static const TechSaleData*
+GetNextTechForSale (void)
+{
+ size_t i = 0;
+ for (i = 0; i < NUM_TECH_ITEMS; ++i)
+ {
+ if (!HasTech (tech_sale_catalog[i].techId))
+ return &tech_sale_catalog[i];
+ }
+
+ return NULL;
+}
+
+///////////End Melnorme Sales Section//////////////////
+
static StatMsgMode prevMsgMode;
static void DoFirstMeeting (RESPONSE_REF R);
@@ -247,6 +530,34 @@
static COUNT rescue_fuel;
static SIS_STATE SIS_copy;
+// Extract method to return the response string index
+// for stripping a given module.
+static int
+GetStripModuleRef (int moduleID)
+{
+ switch (moduleID)
+ {
+ case PLANET_LANDER: return LANDERS;
+ case FUSION_THRUSTER: return THRUSTERS;
+ case TURNING_JETS: return JETS;
+ case CREW_POD: return PODS;
+ case STORAGE_BAY: return BAYS;
+ case DYNAMO_UNIT: return DYNAMOS;
+ case SHIVA_FURNACE: return FURNACES;
+ case GUN_WEAPON: return GUNS;
+ case BLASTER_WEAPON: return BLASTERS;
+ case CANNON_WEAPON: return CANNONS;
+ case TRACKING_SYSTEM: return TRACKERS;
+ case ANTIMISSILE_DEFENSE: return DEFENSES;
+ // If a modder has added new modules, should it really
+ // be a fatal error if the Melnorme don't know about
+ // them?
+ default:
+ assert (0 && "Unknown module");
+ }
+ return 0;
+}
+
static BOOLEAN
StripShip (COUNT fuel_required)
{
@@ -414,54 +725,10 @@
{
if (module_count[i])
{
- RESPONSE_REF pStr = 0;
-
- switch (i)
- {
- case PLANET_LANDER:
- pStr = LANDERS;
- break;
- case FUSION_THRUSTER:
- pStr = THRUSTERS;
- break;
- case TURNING_JETS:
- pStr = JETS;
- break;
- case CREW_POD:
- pStr = PODS;
- break;
- case STORAGE_BAY:
- pStr = BAYS;
- break;
- case DYNAMO_UNIT:
- pStr = DYNAMOS;
- break;
- case SHIVA_FURNACE:
- pStr = FURNACES;
- break;
- case GUN_WEAPON:
- pStr = GUNS;
- break;
- case BLASTER_WEAPON:
- pStr = BLASTERS;
- break;
- case CANNON_WEAPON:
- pStr = CANNONS;
- break;
- case TRACKING_SYSTEM:
- pStr = TRACKERS;
- break;
- case ANTIMISSILE_DEFENSE:
- pStr = DEFENSES;
- break;
- default:
- assert (0 && "Unknown module");
- }
-
if (i == end_mod && i != beg_mod)
NPCPhrase (END_LIST_WITH_AND);
NPCPhrase (ENUMERATE_ONE + (module_count[i] - 1));
- NPCPhrase (pStr);
+ NPCPhrase (GetStripModuleRef (i));
}
}
}
@@ -569,183 +836,110 @@
}
}
-static COUNT
+// Extract method for getting the player's current credits.
+static COUNT
+GetAvailableCredits (void)
+{
+ return MAKE_WORD (GET_GAME_STATE (MELNORME_CREDIT0),
+ GET_GAME_STATE (MELNORME_CREDIT1));
+}
+
+// Extract method for setting the player's current credits.
+static void
+SetAvailableCredits (COUNT credits)
+{
+ SET_GAME_STATE (MELNORME_CREDIT0, LOBYTE (credits));
+ SET_GAME_STATE (MELNORME_CREDIT1, HIBYTE (credits));
+}
+
+// Now returns whether the purchase succeeded instead of the remaining
+// credit balance. Use GetAvailableCredits() to get the latter.
+static bool
DeltaCredit (SIZE delta_credit)
{
- COUNT Credit;
+ COUNT Credit = GetAvailableCredits ();
- Credit = MAKE_WORD (
- GET_GAME_STATE (MELNORME_CREDIT0),
- GET_GAME_STATE (MELNORME_CREDIT1)
- );
+ // Can they afford it?
if ((int)delta_credit >= 0 || ((int)(-delta_credit) <= (int)(Credit)))
{
Credit += delta_credit;
- SET_GAME_STATE (MELNORME_CREDIT0, LOBYTE (Credit));
- SET_GAME_STATE (MELNORME_CREDIT1, HIBYTE (Credit));
+ SetAvailableCredits (Credit);
LockMutex (GraphicsLock);
DrawStatusMessage (NULL);
UnlockMutex (GraphicsLock);
+ return true;
}
- else
- {
- NPCPhrase (NEED_MORE_CREDIT0);
- NPCNumber (-delta_credit - Credit, NULL);
- NPCPhrase (NEED_MORE_CREDIT1);
- }
+
+ // Fail
+ NPCPhrase (NEED_MORE_CREDIT0);
+ NPCNumber (-delta_credit - Credit, NULL);
+ NPCPhrase (NEED_MORE_CREDIT1);
- return (Credit);
+ return false;
}
+
+// Extract methods to process the giving of various bits of information to the
+// player. Ideally, we'd want to merge these three into a single parameterized
+// function, but the nature of the XXX_GAME_STATE() code makes that tricky.
static void
CurrentEvents (void)
{
- BYTE stack;
-
- stack = GET_GAME_STATE (MELNORME_EVENTS_INFO_STACK);
- switch (stack++)
- {
- case 0:
- NPCPhrase (OK_BUY_EVENT_1);
- break;
- case 1:
- NPCPhrase (OK_BUY_EVENT_2);
- break;
- case 2:
- NPCPhrase (OK_BUY_EVENT_3);
- break;
- case 3:
- NPCPhrase (OK_BUY_EVENT_4);
- break;
- case 4:
- NPCPhrase (OK_BUY_EVENT_5);
- break;
- case 5:
- NPCPhrase (OK_BUY_EVENT_6);
- break;
- case 6:
- NPCPhrase (OK_BUY_EVENT_7);
- break;
- case 7:
- NPCPhrase (OK_BUY_EVENT_8);
- break;
- }
- SET_GAME_STATE (MELNORME_EVENTS_INFO_STACK, stack);
+ BYTE stack = GET_GAME_STATE (MELNORME_EVENTS_INFO_STACK);
+ const int phraseId = GetLineSafe (ok_buy_event_lines, stack);
+ NPCPhrase (phraseId);
+ SET_GAME_STATE (MELNORME_EVENTS_INFO_STACK, stack + 1);
}
static void
AlienRaces (void)
{
- BYTE stack;
-
- stack = GET_GAME_STATE (MELNORME_ALIEN_INFO_STACK);
- switch (stack++)
+ BYTE stack = GET_GAME_STATE (MELNORME_ALIEN_INFO_STACK);
+ const int phraseId = GetLineSafe (ok_buy_alien_race_lines, stack);
+ // Two pieces of alien knowledge trigger state changes.
+ switch (phraseId)
{
- case 0:
- NPCPhrase (OK_BUY_ALIEN_RACE_1);
- break;
- case 1:
- NPCPhrase (OK_BUY_ALIEN_RACE_2);
- break;
- case 2:
- NPCPhrase (OK_BUY_ALIEN_RACE_3);
- break;
- case 3:
- NPCPhrase (OK_BUY_ALIEN_RACE_4);
- break;
- case 4:
- NPCPhrase (OK_BUY_ALIEN_RACE_5);
- break;
- case 5:
- NPCPhrase (OK_BUY_ALIEN_RACE_6);
- break;
- case 6:
- NPCPhrase (OK_BUY_ALIEN_RACE_7);
- break;
- case 7:
- NPCPhrase (OK_BUY_ALIEN_RACE_8);
- break;
- case 8:
- NPCPhrase (OK_BUY_ALIEN_RACE_9);
- break;
- case 9:
- NPCPhrase (OK_BUY_ALIEN_RACE_10);
- break;
- case 10:
- NPCPhrase (OK_BUY_ALIEN_RACE_11);
- break;
- case 11:
- NPCPhrase (OK_BUY_ALIEN_RACE_12);
- break;
- case 12:
- NPCPhrase (OK_BUY_ALIEN_RACE_13);
- break;
- case 13:
- NPCPhrase (OK_BUY_ALIEN_RACE_14);
+ case OK_BUY_ALIEN_RACE_14:
if (!GET_GAME_STATE (FOUND_PLUTO_SPATHI))
{
SET_GAME_STATE (KNOW_SPATHI_PASSWORD, 1);
SET_GAME_STATE (SPATHI_HOME_VISITS, 7);
}
break;
- case 14:
- NPCPhrase (OK_BUY_ALIEN_RACE_15);
+ case OK_BUY_ALIEN_RACE_15:
if (GET_GAME_STATE (KNOW_ABOUT_SHATTERED) < 2)
{
SET_GAME_STATE (KNOW_ABOUT_SHATTERED, 2);
}
SET_GAME_STATE (KNOW_SYREEN_WORLD_SHATTERED, 1);
break;
- case 15:
- NPCPhrase (OK_BUY_ALIEN_RACE_16);
- break;
}
- SET_GAME_STATE (MELNORME_ALIEN_INFO_STACK, stack);
+ NPCPhrase (phraseId);
+ SET_GAME_STATE (MELNORME_ALIEN_INFO_STACK, stack + 1);
}
static void
History (void)
{
- BYTE stack;
+ BYTE stack = GET_GAME_STATE (MELNORME_HISTORY_INFO_STACK);
+ const int phraseId = GetLineSafe (ok_buy_history_lines, stack);
+ NPCPhrase (phraseId);
+ SET_GAME_STATE (MELNORME_HISTORY_INFO_STACK, stack + 1);
+}
- stack = GET_GAME_STATE (MELNORME_HISTORY_INFO_STACK);
- switch (stack++)
- {
- case 0:
- NPCPhrase (OK_BUY_HISTORY_1);
- break;
- case 1:
- NPCPhrase (OK_BUY_HISTORY_2);
- break;
- case 2:
- NPCPhrase (OK_BUY_HISTORY_3);
- break;
- case 3:
- NPCPhrase (OK_BUY_HISTORY_4);
- break;
- case 4:
- NPCPhrase (OK_BUY_HISTORY_5);
- break;
- case 5:
- NPCPhrase (OK_BUY_HISTORY_6);
- break;
- case 6:
- NPCPhrase (OK_BUY_HISTORY_7);
- break;
- case 7:
- NPCPhrase (OK_BUY_HISTORY_8);
- break;
- case 8:
- NPCPhrase (OK_BUY_HISTORY_9);
- break;
- }
- SET_GAME_STATE (MELNORME_HISTORY_INFO_STACK, stack);
+// extract method to tell if we have any information left to sell to the player.
+static bool AnyInfoLeftToSell (void)
+{
+ return GET_GAME_STATE (MELNORME_EVENTS_INFO_STACK) < NUM_EVENT_ITEMS
+ || GET_GAME_STATE (MELNORME_ALIEN_INFO_STACK) < NUM_ALIEN_RACE_ITEMS
+ || GET_GAME_STATE (MELNORME_HISTORY_INFO_STACK) < NUM_HISTORY_ITEMS;
}
static void NatureOfConversation (RESPONSE_REF R);
static BYTE AskedToBuy;
+
static void
DoBuy (RESPONSE_REF R)
{
@@ -754,10 +948,7 @@
BYTE slot;
DWORD capacity;
- credit = MAKE_WORD (
- GET_GAME_STATE (MELNORME_CREDIT0),
- GET_GAME_STATE (MELNORME_CREDIT1)
- );
+ credit = GetAvailableCredits ();
capacity = FUEL_RESERVE;
slot = NUM_MODULE_SLOTS - 1;
@@ -774,6 +965,7 @@
}
} while (slot--);
+ // If they're out of credits, educate them on how commerce works.
if (credit == 0)
{
AskedToBuy = TRUE;
@@ -856,224 +1048,44 @@
else if (PLAYER_SAID (R, buy_technology)
|| PLAYER_SAID (R, buy_new_tech))
{
- BYTE stack;
+ // Note that this code no longer uses the MELNORME_TECH_STACK state
+ // buts, as they're not needed; we can tell what technologies the
+ // player has by using the technology API above. This opens the
+ // possibility of the player acquiring tech from someplace other than
+ // the Melnorme.
+ const TechSaleData* nextTech;
- needed_credit = 0;
- if (PLAYER_SAID (R, buy_technology))
+ // If it's our first time, give an introduction.
+ if (!GET_GAME_STATE (MELNORME_TECH_PROCEDURE))
{
- if (!GET_GAME_STATE (MELNORME_TECH_PROCEDURE))
- {
- NPCPhrase (BUY_NEW_TECH_INTRO);
- SET_GAME_STATE (MELNORME_TECH_PROCEDURE, 1);
- }
- stack = 0;
+ NPCPhrase (BUY_NEW_TECH_INTRO);
+ SET_GAME_STATE (MELNORME_TECH_PROCEDURE, 1);
}
- else
+
+ // Did the player just attempt to buy a tech?
+ if (PLAYER_SAID (R, buy_new_tech))
{
- RESPONSE_REF pStr = 0;
+ nextTech = GetNextTechForSale ();
+ if (!nextTech)
+ goto BuyBuyBuy; // No tech left to buy
- stack = GET_GAME_STATE (MELNORME_TECH_STACK);
- switch (stack)
- {
- case 0:
- pStr = OK_BUY_NEW_TECH_1;
- needed_credit = 75 * BIO_CREDIT_VALUE;
- break;
- case 1:
- pStr = OK_BUY_NEW_TECH_2;
- needed_credit = 75 * BIO_CREDIT_VALUE;
- break;
- case 2:
- pStr = OK_BUY_NEW_TECH_3;
- needed_credit = 75 * BIO_CREDIT_VALUE;
- break;
- case 3:
- pStr = OK_BUY_NEW_TECH_4;
- needed_credit = 75 * BIO_CREDIT_VALUE;
- break;
- case 4:
- pStr = OK_BUY_NEW_TECH_5;
- needed_credit = 75 * BIO_CREDIT_VALUE;
- break;
- case 5:
- pStr = OK_BUY_NEW_TECH_6;
- needed_credit = 75 * BIO_CREDIT_VALUE;
- break;
- case 6:
- pStr = OK_BUY_NEW_TECH_7;
- needed_credit = 75 * BIO_CREDIT_VALUE;
- break;
- case 7:
- pStr = OK_BUY_NEW_TECH_8;
- needed_credit = 75 * BIO_CREDIT_VALUE;
- break;
- case 8:
- pStr = OK_BUY_NEW_TECH_9;
- needed_credit = 75 * BIO_CREDIT_VALUE;
- break;
- case 9:
- pStr = OK_BUY_NEW_TECH_10;
- needed_credit = 75 * BIO_CREDIT_VALUE;
- break;
- case 10:
- pStr = OK_BUY_NEW_TECH_11;
- needed_credit = 75 * BIO_CREDIT_VALUE;
- break;
- case 11:
- pStr = OK_BUY_NEW_TECH_12;
- needed_credit = 75 * BIO_CREDIT_VALUE;
- break;
- case 12:
- pStr = OK_BUY_NEW_TECH_13;
- needed_credit = 75 * BIO_CREDIT_VALUE;
- break;
- default:
- assert (0 && "Unknown tech");
- }
- if ((int)needed_credit > (int)credit)
- {
- DeltaCredit (-needed_credit);
- goto BuyBuyBuy;
- }
- else
- {
- ++stack;
- NPCPhrase (pStr);
- DeltaCredit (-needed_credit);
- }
+ if (!DeltaCredit (-nextTech->price))
+ goto BuyBuyBuy; // Can't afford it
+
+ // Make the sale
+ GrantTech (nextTech->techId);
+ NPCPhrase (nextTech->sold_line);
}
- switch (stack)
+ nextTech = GetNextTechForSale ();
+ if (!nextTech)
{
- case 0:
- if (GLOBAL (ModuleCost[BLASTER_WEAPON]) == 0)
- {
- NPCPhrase (NEW_TECH_1);
- break;
- }
- ++stack;
- case 1:
- GLOBAL (ModuleCost[BLASTER_WEAPON]) =
- 4000 / MODULE_COST_SCALE;
- if (!GET_GAME_STATE (IMPROVED_LANDER_SPEED))
- {
- NPCPhrase (NEW_TECH_2);
- break;
- }
- ++stack;
- case 2:
- SET_GAME_STATE (IMPROVED_LANDER_SPEED, 1);
- if (GLOBAL (ModuleCost[ANTIMISSILE_DEFENSE]) == 0)
- {
- NPCPhrase (NEW_TECH_3);
- break;
- }
- ++stack;
- case 3:
- GLOBAL (ModuleCost[ANTIMISSILE_DEFENSE]) =
- 4000 / MODULE_COST_SCALE;
- if (!(GET_GAME_STATE (LANDER_SHIELDS)
- & (1 << BIOLOGICAL_DISASTER)))
- {
- NPCPhrase (NEW_TECH_4);
- break;
- }
- ++stack;
- case 4:
- credit = GET_GAME_STATE (LANDER_SHIELDS)
- | (1 << BIOLOGICAL_DISASTER);
- SET_GAME_STATE (LANDER_SHIELDS, credit);
- if (!GET_GAME_STATE (IMPROVED_LANDER_CARGO))
- {
- NPCPhrase (NEW_TECH_5);
- break;
- }
- ++stack;
- case 5:
- SET_GAME_STATE (IMPROVED_LANDER_CARGO, 1);
- if (GLOBAL (ModuleCost[HIGHEFF_FUELSYS]) == 0)
- {
- NPCPhrase (NEW_TECH_6);
- break;
- }
- ++stack;
- case 6:
- GLOBAL (ModuleCost[HIGHEFF_FUELSYS]) =
- 1000 / MODULE_COST_SCALE;
- if (!GET_GAME_STATE (IMPROVED_LANDER_SHOT))
- {
- NPCPhrase (NEW_TECH_7);
- break;
- }
- ++stack;
- case 7:
- SET_GAME_STATE (IMPROVED_LANDER_SHOT, 1);
- if (!(GET_GAME_STATE (LANDER_SHIELDS)
- & (1 << EARTHQUAKE_DISASTER)))
- {
- NPCPhrase (NEW_TECH_8);
- break;
- }
- ++stack;
- case 8:
- credit = GET_GAME_STATE (LANDER_SHIELDS)
- | (1 << EARTHQUAKE_DISASTER);
- SET_GAME_STATE (LANDER_SHIELDS, credit);
- if (GLOBAL (ModuleCost[TRACKING_SYSTEM]) == 0)
- {
- NPCPhrase (NEW_TECH_9);
- break;
- }
- ++stack;
- case 9:
- GLOBAL (ModuleCost[TRACKING_SYSTEM]) =
- 5000 / MODULE_COST_SCALE;
- if (!(GET_GAME_STATE (LANDER_SHIELDS)
- & (1 << LIGHTNING_DISASTER)))
- {
- NPCPhrase (NEW_TECH_10);
- break;
- }
- ++stack;
- case 10:
- credit = GET_GAME_STATE (LANDER_SHIELDS)
- | (1 << LIGHTNING_DISASTER);
- SET_GAME_STATE (LANDER_SHIELDS, credit);
- if (!(GET_GAME_STATE (LANDER_SHIELDS)
- & (1 << LAVASPOT_DISASTER)))
- {
- NPCPhrase (NEW_TECH_11);
- break;
- }
- ++stack;
- case 11:
- credit = GET_GAME_STATE (LANDER_SHIELDS)
- | (1 << LAVASPOT_DISASTER);
- SET_GAME_STATE (LANDER_SHIELDS, credit);
- if (GLOBAL (ModuleCost[CANNON_WEAPON]) == 0)
- {
- NPCPhrase (NEW_TECH_12);
- break;
- }
- ++stack;
- case 12:
- GLOBAL (ModuleCost[CANNON_WEAPON]) =
- 6000 / MODULE_COST_SCALE;
- if (GLOBAL (ModuleCost[SHIVA_FURNACE]) == 0)
- {
- NPCPhrase (NEW_TECH_13);
- break;
- }
- ++stack;
- case 13:
- GLOBAL (ModuleCost[SHIVA_FURNACE]) =
- 4000 / MODULE_COST_SCALE;
- NPCPhrase (NEW_TECH_ALL_GONE);
- SET_GAME_STATE (MELNORME_TECH_STACK, stack);
- goto BuyBuyBuy;
+ NPCPhrase (NEW_TECH_ALL_GONE);
+ goto BuyBuyBuy; // No tech left to buy
}
- SET_GAME_STATE (MELNORME_TECH_STACK, stack);
+ NPCPhrase (nextTech->sale_line);
+
Response (buy_new_tech, DoBuy);
Response (no_buy_new_tech, DoBuy);
}
@@ -1082,44 +1094,35 @@
|| PLAYER_SAID (R, buy_alien_races)
|| PLAYER_SAID (R, buy_history))
{
- needed_credit = 0;
- if (PLAYER_SAID (R, buy_info))
+ if (!GET_GAME_STATE (MELNORME_INFO_PROCEDURE))
{
- if (GET_GAME_STATE (MELNORME_INFO_PROCEDURE))
- NPCPhrase (OK_BUY_INFO);
- else
- {
- NPCPhrase (BUY_INFO_INTRO);
- SET_GAME_STATE (MELNORME_INFO_PROCEDURE, 1);
- }
+ NPCPhrase (BUY_INFO_INTRO);
+ SET_GAME_STATE (MELNORME_INFO_PROCEDURE, 1);
}
+ else if (PLAYER_SAID (R, buy_info))
+ {
+ NPCPhrase (OK_BUY_INFO);
+ }
else
{
#define INFO_COST 75
- needed_credit = INFO_COST;
- if ((int)credit >= (int)needed_credit)
- {
- if (PLAYER_SAID (R, buy_current_events))
- CurrentEvents ();
- else if (PLAYER_SAID (R, buy_alien_races))
- AlienRaces ();
- else /* if (R == buy_history) */
- History ();
- }
-
- DeltaCredit (-needed_credit);
- if (GET_GAME_STATE (MELNORME_EVENTS_INFO_STACK) < NUM_EVENT_ITEMS
- || GET_GAME_STATE (MELNORME_ALIEN_INFO_STACK) < NUM_ALIEN_RACE_ITEMS
- || GET_GAME_STATE (MELNORME_HISTORY_INFO_STACK) < NUM_HISTORY_ITEMS)
- {
- }
- else
- {
- NPCPhrase (INFO_ALL_GONE);
+ if (!DeltaCredit (-INFO_COST))
goto BuyBuyBuy;
- }
+
+ if (PLAYER_SAID (R, buy_current_events))
+ CurrentEvents ();
+ else if (PLAYER_SAID (R, buy_alien_races))
+ AlienRaces ();
+ else if (PLAYER_SAID (R, buy_history))
+ History ();
}
+ if (!AnyInfoLeftToSell ())
+ {
+ NPCPhrase (INFO_ALL_GONE);
+ goto BuyBuyBuy;
+ }
+
if (GET_GAME_STATE (MELNORME_EVENTS_INFO_STACK) < NUM_EVENT_ITEMS)
Response (buy_current_events, DoBuy);
if (GET_GAME_STATE (MELNORME_ALIEN_INFO_STACK) < NUM_ALIEN_RACE_ITEMS)
@@ -1142,12 +1145,11 @@
BuyBuyBuy:
if (GLOBAL_SIS (FuelOnBoard) < capacity)
Response (buy_fuel, DoBuy);
- if (GET_GAME_STATE (MELNORME_TECH_STACK) < NUM_TECH_ITEMS)
+ if (GetNextTechForSale ())
Response (buy_technology, DoBuy);
- if (GET_GAME_STATE (MELNORME_ALIEN_INFO_STACK) < NUM_ALIEN_RACE_ITEMS
- || GET_GAME_STATE (MELNORME_HISTORY_INFO_STACK) < NUM_HISTORY_ITEMS
- || GET_GAME_STATE (MELNORME_EVENTS_INFO_STACK) < NUM_EVENT_ITEMS)
+ if (AnyInfoLeftToSell ())
Response (buy_info, DoBuy);
+
Response (done_buying, NatureOfConversation);
Response (be_leaving_now, ExitConversation);
}
@@ -1267,6 +1269,7 @@
}
}
+
static void
NatureOfConversation (RESPONSE_REF R)
{
@@ -1280,46 +1283,15 @@
R = 0;
}
- Credit = DeltaCredit (0);
+ // Draw credits display
+ DeltaCredit (0);
+ Credit = GetAvailableCredits ();
if (R == 0)
{
- BYTE stack;
-
- stack = (BYTE)(GET_GAME_STATE (MELNORME_YACK_STACK2) - 5);
- switch (stack++)
- {
- case 0:
- NPCPhrase (HELLO_AND_DOWN_TO_BUSINESS_1);
- break;
- case 1:
- NPCPhrase (HELLO_AND_DOWN_TO_BUSINESS_2);
- break;
- case 2:
- NPCPhrase (HELLO_AND_DOWN_TO_BUSINESS_3);
- break;
- case 3:
- NPCPhrase (HELLO_AND_DOWN_TO_BUSINESS_4);
- break;
- case 4:
- NPCPhrase (HELLO_AND_DOWN_TO_BUSINESS_5);
- break;
- case 5:
- NPCPhrase (HELLO_AND_DOWN_TO_BUSINESS_6);
- break;
- case 6:
- NPCPhrase (HELLO_AND_DOWN_TO_BUSINESS_7);
- break;
- case 7:
- NPCPhrase (HELLO_AND_DOWN_TO_BUSINESS_8);
- break;
- case 8:
- NPCPhrase (HELLO_AND_DOWN_TO_BUSINESS_9);
- break;
- default:
- --stack;
- NPCPhrase (HELLO_AND_DOWN_TO_BUSINESS_10);
- break;
- }
+ BYTE stack = GET_GAME_STATE (MELNORME_YACK_STACK2) - 5;
+ NPCPhrase (GetLineSafe (hello_and_down_to_business_lines, stack));
+ if (stack < (NUM_HELLO_LINES - 1))
+ ++stack;
SET_GAME_STATE (MELNORME_YACK_STACK2, stack + 5);
}
@@ -1352,11 +1324,11 @@
{
/* Melnorme reports any news and turns purple */
NPCPhrase (BUY_OR_SELL);
- AlienTalkSegue(1);
+ AlienTalkSegue (1);
XFormColorMap (GetColorMapAddress (
SetAbsColorMapIndex (CommData.AlienColorMap, 1)
), ONE_SECOND / 2);
- AlienTalkSegue((COUNT)~0);
+ AlienTalkSegue ((COUNT)~0);
}
else if (PLAYER_SAID (R, why_turned_purple))
{
@@ -1394,33 +1366,11 @@
}
else
{
- BYTE num_rescues;
+ BYTE num_rescues = GET_GAME_STATE (MELNORME_RESCUE_COUNT);
+ NPCPhrase (GetLineSafe (rescue_lines, num_rescues));
- num_rescues = GET_GAME_STATE (MELNORME_RESCUE_COUNT);
- switch (num_rescues)
+ if (num_rescues < NUM_RESCUE_LINES - 1)
{
- case 0:
- NPCPhrase (RESCUE_EXPLANATION);
- break;
- case 1:
- NPCPhrase (RESCUE_AGAIN_1);
- break;
- case 2:
- NPCPhrase (RESCUE_AGAIN_2);
- break;
- case 3:
- NPCPhrase (RESCUE_AGAIN_3);
- break;
- case 4:
- NPCPhrase (RESCUE_AGAIN_4);
- break;
- case 5:
- NPCPhrase (RESCUE_AGAIN_5);
- break;
- }
-
- if (num_rescues < 5)
- {
++num_rescues;
SET_GAME_STATE (MELNORME_RESCUE_COUNT, num_rescues);
}
Modified: trunk/sc2/src/uqm/globdata.h
===================================================================
--- trunk/sc2/src/uqm/globdata.h 2011-07-09 21:52:21 UTC (rev 3643)
+++ trunk/sc2/src/uqm/globdata.h 2011-07-13 17:29:42 UTC (rev 3644)
@@ -595,6 +595,7 @@
ADD_GAME_STATE (MELNORME_INFO_PROCEDURE, 1)
ADD_GAME_STATE (MELNORME_TECH_STACK, 4)
+ /* MELNORME_TECH_STACK is now unused */
ADD_GAME_STATE (MELNORME_EVENTS_INFO_STACK, 5)
ADD_GAME_STATE (MELNORME_ALIEN_INFO_STACK, 5)
ADD_GAME_STATE (MELNORME_HISTORY_INFO_STACK, 5)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Mee...@us...> - 2011-07-09 21:52:27
|
Revision: 3643
http://sc2.svn.sourceforge.net/sc2/?rev=3643&view=rev
Author: Meep-Eep
Date: 2011-07-09 21:52:21 +0000 (Sat, 09 Jul 2011)
Log Message:
-----------
Spelling.
Modified Paths:
--------------
trunk/sc2/Contributing
Modified: trunk/sc2/Contributing
===================================================================
--- trunk/sc2/Contributing 2011-07-09 21:49:07 UTC (rev 3642)
+++ trunk/sc2/Contributing 2011-07-09 21:52:21 UTC (rev 3643)
@@ -5,7 +5,7 @@
Before making changes:
- Read this entire document
-- See if the the Bugzilla bug database at
+- See if the Bugzilla bug database at
http://bugs.uqm.stack.nl/ contains any comments on what you're planning
to do.
- Make sure you're using the most recent Subversion version
@@ -26,9 +26,9 @@
we don't even always do, but we've accepted this as our standard. The main
reason is that this is very close to the original style.
Trying to start a discussion about the standard is pointless and is
- definately NOT appreciated.
+ definitely NOT appreciated.
- Use 1 tab per indentation level
- - Use no more than 76 chars on a line, when using a tabsize of 4.
+ - Use no more than 76 chars on a line, when using a tab size of 4.
- Use 2 extra indentation levels for the continuation of a broken line,
like this:
if (blablablabla || foobar ||
@@ -47,7 +47,7 @@
}
(Though in this particular case, I personally would repeat the 'long',
or place l and m on the same line)
- - Put { on a seperate line, both for the start of a function and
+ - Put { on a separate line, both for the start of a function and
for the start of a block.
- one space around binary operators, and after commas.
- one space between the function name and following '(', both in
@@ -101,7 +101,7 @@
mentioning an URL where we can get the patch.
The committers are listed below (in alphabetical order), with their
particular field of expertise with the source. Though all of us
- should have enough experience to deal with most issues not explicitely
+ should have enough experience to deal with most issues not explicitly
mentioned.
Serge van den Boom (svdb at stack.nl), SvdB at #sc2
- Resource system
@@ -113,7 +113,7 @@
- Graphics
- Sound
- General issues
- Michael Martin (mcmartin at stanford.edu), McMartin at #sc2
+ Michael Martin (mcmartin at mail.com), McMartin at #sc2
- Threading
- Graphics
- Input system
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Mee...@us...> - 2011-07-09 21:49:13
|
Revision: 3642
http://sc2.svn.sourceforge.net/sc2/?rev=3642&view=rev
Author: Meep-Eep
Date: 2011-07-09 21:49:07 +0000 (Sat, 09 Jul 2011)
Log Message:
-----------
update
Modified Paths:
--------------
trunk/sc2/Contributing
Modified: trunk/sc2/Contributing
===================================================================
--- trunk/sc2/Contributing 2011-07-09 16:12:21 UTC (rev 3641)
+++ trunk/sc2/Contributing 2011-07-09 21:49:07 UTC (rev 3642)
@@ -65,8 +65,8 @@
because you think that would be easier than trying to understand the
original. If you don't have the skills or patience to do so, this is not
the place for you.
-- Only use portable functions. The code is intended to work on Windows,
- Linux, FreeBSD, BeOS and MacOS X.
+- Only use portable functions. The code is intended to work on Windows
+ (MSVC 6), Linux (GCC 4), FreeBSD (GCC 4) and MacOS X (GCC 4).
Try to avoid unnecessary system-dependant code, but use #ifdefs if you
really have to.
- No shortcuts. Don't assume anything about user input (like the length),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <av...@us...> - 2011-07-09 16:12:27
|
Revision: 3641
http://sc2.svn.sourceforge.net/sc2/?rev=3641&view=rev
Author: avolkov
Date: 2011-07-09 16:12:21 +0000 (Sat, 09 Jul 2011)
Log Message:
-----------
Added aspect ratio option to the setup menu
Modified Paths:
--------------
trunk/sc2/ChangeLog
trunk/sc2/content/base/ui/setupmenu.txt
trunk/sc2/src/uqm/setupmenu.c
trunk/sc2/src/uqm/setupmenu.h
Modified: trunk/sc2/ChangeLog
===================================================================
--- trunk/sc2/ChangeLog 2011-07-09 05:27:47 UTC (rev 3640)
+++ trunk/sc2/ChangeLog 2011-07-09 16:12:21 UTC (rev 3641)
@@ -1,4 +1,5 @@
Changes towards version 0.8:
+- Added aspect ratio option to the setup menu - Alex
- Added speech option which controls loading of 3dovoice addon (no need
to set speech volume to 0 anymore) - Alex
- Added the MetaChron story to the no-voice Melnorme script (bug #43) - Alex
Modified: trunk/sc2/content/base/ui/setupmenu.txt
===================================================================
--- trunk/sc2/content/base/ui/setupmenu.txt 2011-07-09 05:27:47 UTC (rev 3640)
+++ trunk/sc2/content/base/ui/setupmenu.txt 2011-07-09 16:12:21 UTC (rev 3641)
@@ -35,6 +35,7 @@
Control Set
UQM Remixes
Speech
+Aspect Ratio
#(CAT_0_OPTS)
320x240
@@ -436,6 +437,20 @@
version where there are differences.
Requires a restart of UQM to take effect.
+#(CAT_23_OPTS)
+Any
+Force 4:3
+
+#(CAT_23_OPT_0_DESC)
+Allow any aspect ratio. The game may be
+stretched in windows that are not 4:3.
+Currently only meaningful in OpenGL mode.
+
+#(CAT_23_OPT_1_DESC)
+Display the game with 4:3 aspect even when
+the window is not.
+Currently only meaningful in OpenGL mode.
+
#(SLIDERS)
Music Volume
SFX Volume
Modified: trunk/sc2/src/uqm/setupmenu.c
===================================================================
--- trunk/sc2/src/uqm/setupmenu.c 2011-07-09 05:27:47 UTC (rev 3640)
+++ trunk/sc2/src/uqm/setupmenu.c 2011-07-09 16:12:21 UTC (rev 3641)
@@ -73,7 +73,7 @@
#endif
#define MENU_COUNT 8
-#define CHOICE_COUNT 23
+#define CHOICE_COUNT 24
#define SLIDER_COUNT 3
#define BUTTON_COUNT 10
#define LABEL_COUNT 4
@@ -96,7 +96,7 @@
static int choice_widths[CHOICE_COUNT] = {
3, 2, 3, 3, 2, 2, 2, 2, 2, 2,
2, 2, 3, 2, 2, 3, 3, 2, 3, 3,
- 3, 2, 2 };
+ 3, 2, 2, 2 };
static HANDLER button_handlers[BUTTON_COUNT] = {
quit_main_menu, quit_sub_menu, do_graphics, do_engine,
@@ -117,6 +117,7 @@
static WIDGET *graphics_widgets[] = {
(WIDGET *)(&choices[0]),
+ (WIDGET *)(&choices[23]),
(WIDGET *)(&choices[10]),
(WIDGET *)(&choices[2]),
(WIDGET *)(&choices[3]),
@@ -399,6 +400,7 @@
choices[20].selected = 0;
choices[21].selected = opts.musicremix;
choices[22].selected = opts.speech;
+ choices[23].selected = opts.keepaspect;
sliders[0].value = opts.musicvol;
sliders[1].value = opts.sfxvol;
@@ -431,6 +433,7 @@
opts.player2 = choices[19].selected;
opts.musicremix = choices[21].selected;
opts.speech = choices[22].selected;
+ opts.keepaspect = choices[23].selected;
opts.musicvol = sliders[0].value;
opts.sfxvol = sliders[1].value;
@@ -1121,6 +1124,7 @@
opts->music3do = opt3doMusic ? OPTVAL_ENABLED : OPTVAL_DISABLED;
opts->musicremix = optRemixMusic ? OPTVAL_ENABLED : OPTVAL_DISABLED;
opts->speech = optSpeech ? OPTVAL_ENABLED : OPTVAL_DISABLED;
+ opts->keepaspect = optKeepAspectRatio ? OPTVAL_ENABLED : OPTVAL_DISABLED;
switch (snddriver) {
case audio_DRIVER_OPENAL:
opts->adriver = OPTVAL_OPENAL;
@@ -1343,6 +1347,7 @@
optSpeech = (opts->speech == OPTVAL_ENABLED);
optWhichIntro = (opts->intro == OPTVAL_3DO) ? OPT_3DO : OPT_PC;
optStereoSFX = (opts->stereo == OPTVAL_ENABLED);
+ optKeepAspectRatio = (opts->keepaspect == OPTVAL_ENABLED);
PlayerControls[0] = opts->player1;
PlayerControls[1] = opts->player2;
@@ -1360,6 +1365,7 @@
res_PutBoolean ("config.smoothmelee", opts->meleezoom == OPTVAL_3DO);
res_PutBoolean ("config.positionalsfx", opts->stereo == OPTVAL_ENABLED);
res_PutBoolean ("config.pulseshield", opts->shield == OPTVAL_3DO);
+ res_PutBoolean ("config.keepaspectratio", opts->keepaspect == OPTVAL_ENABLED);
res_PutInteger ("config.player1control", opts->player1);
res_PutInteger ("config.player2control", opts->player2);
Modified: trunk/sc2/src/uqm/setupmenu.h
===================================================================
--- trunk/sc2/src/uqm/setupmenu.h 2011-07-09 05:27:47 UTC (rev 3640)
+++ trunk/sc2/src/uqm/setupmenu.h 2011-07-09 16:12:21 UTC (rev 3641)
@@ -76,6 +76,7 @@
OPT_AQUALITYTYPE aquality;
OPT_ENABLABLE fullscreen, subtitles, scanlines, fps, stereo;
OPT_ENABLABLE music3do, musicremix, speech;
+ OPT_ENABLABLE keepaspect;
OPT_CONSOLETYPE menu, text, cscan, scroll, intro, meleezoom, shield;
CONTROL_TEMPLATE player1, player2;
int speechvol, musicvol, sfxvol;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <av...@us...> - 2011-07-09 05:27:53
|
Revision: 3640
http://sc2.svn.sourceforge.net/sc2/?rev=3640&view=rev
Author: avolkov
Date: 2011-07-09 05:27:47 +0000 (Sat, 09 Jul 2011)
Log Message:
-----------
Make adding items to the setup menu slightly less error-prone
Modified Paths:
--------------
trunk/sc2/src/uqm/setupmenu.c
Modified: trunk/sc2/src/uqm/setupmenu.c
===================================================================
--- trunk/sc2/src/uqm/setupmenu.c 2011-07-09 03:49:12 UTC (rev 3639)
+++ trunk/sc2/src/uqm/setupmenu.c 2011-07-09 05:27:47 UTC (rev 3640)
@@ -103,18 +103,6 @@
do_audio, do_resources, do_keyconfig, do_advanced, do_editkeys,
do_keyconfig };
-static int menu_sizes[MENU_COUNT] = {
- 7, 5, 8, 9, 2, 5,
-#ifdef HAVE_OPENGL
- 5,
-#else
- 4,
-#endif
- 11
-};
-
-static int menu_bgs[MENU_COUNT] = { 0, 1, 1, 2, 3, 1, 2, 1 };
-
/* These refer to uninitialized widgets, but that's OK; we'll fill
* them in before we touch them */
static WIDGET *main_widgets[] = {
@@ -124,14 +112,16 @@
(WIDGET *)(&buttons[5]),
(WIDGET *)(&buttons[6]),
(WIDGET *)(&buttons[7]),
- (WIDGET *)(&buttons[0]) };
+ (WIDGET *)(&buttons[0]),
+ NULL };
static WIDGET *graphics_widgets[] = {
(WIDGET *)(&choices[0]),
(WIDGET *)(&choices[10]),
(WIDGET *)(&choices[2]),
(WIDGET *)(&choices[3]),
- (WIDGET *)(&buttons[1]) };
+ (WIDGET *)(&buttons[1]),
+ NULL };
static WIDGET *audio_widgets[] = {
(WIDGET *)(&sliders[0]),
@@ -141,7 +131,8 @@
(WIDGET *)(&choices[9]),
(WIDGET *)(&choices[21]),
(WIDGET *)(&choices[22]),
- (WIDGET *)(&buttons[1]) };
+ (WIDGET *)(&buttons[1]),
+ NULL };
static WIDGET *engine_widgets[] = {
(WIDGET *)(&choices[4]),
@@ -152,7 +143,8 @@
(WIDGET *)(&choices[13]),
(WIDGET *)(&choices[11]),
(WIDGET *)(&choices[17]),
- (WIDGET *)(&buttons[1]) };
+ (WIDGET *)(&buttons[1]),
+ NULL };
static WIDGET *advanced_widgets[] = {
#ifdef HAVE_OPENGL
@@ -161,14 +153,16 @@
(WIDGET *)(&choices[12]),
(WIDGET *)(&choices[15]),
(WIDGET *)(&choices[16]),
- (WIDGET *)(&buttons[1]) };
+ (WIDGET *)(&buttons[1]),
+ NULL };
static WIDGET *keyconfig_widgets[] = {
(WIDGET *)(&choices[18]),
(WIDGET *)(&choices[19]),
(WIDGET *)(&labels[1]),
(WIDGET *)(&buttons[8]),
- (WIDGET *)(&buttons[1]) };
+ (WIDGET *)(&buttons[1]),
+ NULL };
static WIDGET *editkeys_widgets[] = {
(WIDGET *)(&choices[20]),
@@ -181,15 +175,31 @@
(WIDGET *)(&controlentries[4]),
(WIDGET *)(&controlentries[5]),
(WIDGET *)(&controlentries[6]),
- (WIDGET *)(&buttons[9]) };
+ (WIDGET *)(&buttons[9]),
+ NULL };
static WIDGET *incomplete_widgets[] = {
(WIDGET *)(&labels[0]),
- (WIDGET *)(&buttons[1]) };
+ (WIDGET *)(&buttons[1]),
+ NULL };
-static WIDGET **menu_widgets[MENU_COUNT] = {
- main_widgets, graphics_widgets, audio_widgets, engine_widgets,
- incomplete_widgets, keyconfig_widgets, advanced_widgets, editkeys_widgets };
+static const struct
+{
+ WIDGET **widgets;
+ int bgIndex;
+}
+menu_defs[] =
+{
+ {main_widgets, 0},
+ {graphics_widgets, 1},
+ {audio_widgets, 1},
+ {engine_widgets, 2},
+ {incomplete_widgets, 3},
+ {keyconfig_widgets, 1},
+ {advanced_widgets, 2},
+ {editkeys_widgets, 1},
+ {NULL, 0}
+};
static int
quit_main_menu (WIDGET *self, int event)
@@ -606,6 +616,16 @@
populate_editkeys (template);
}
+static int
+count_widgets (const WIDGET **widgets)
+{
+ int count;
+
+ for (count = 0; *widgets != NULL; ++widgets, ++count)
+ ;
+ return count;
+}
+
static stringbank *bank = NULL;
static FRAME setup_frame = NULL;
@@ -655,11 +675,15 @@
menus[i].subtitle = buffer[i];
menus[i].bgStamp.origin.x = 0;
menus[i].bgStamp.origin.y = 0;
- menus[i].bgStamp.frame = SetAbsFrameIndex (setup_frame, menu_bgs[i]);
- menus[i].num_children = menu_sizes[i];
- menus[i].child = menu_widgets[i];
+ menus[i].bgStamp.frame = SetAbsFrameIndex (setup_frame, menu_defs[i].bgIndex);
+ menus[i].num_children = count_widgets (menu_defs[i].widgets);
+ menus[i].child = menu_defs[i].widgets;
menus[i].highlighted = 0;
}
+ if (menu_defs[i].widgets != NULL)
+ {
+ log_add (log_Error, "Menu definition array has more items!");
+ }
/* Options */
if (SplitString (GetStringAddress (SetAbsStringTableIndex (SetupTab, 2)), '\n', 100, buffer, bank) != CHOICE_COUNT)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <av...@us...> - 2011-07-09 03:49:19
|
Revision: 3639
http://sc2.svn.sourceforge.net/sc2/?rev=3639&view=rev
Author: avolkov
Date: 2011-07-09 03:49:12 +0000 (Sat, 09 Jul 2011)
Log Message:
-----------
Make the switch from positional -> not positional sfx actually work w/o having sfx channels permanently stuck somewhere in 3D world; there is no reason to use different distance models, and that eliminates the need to change models when switching positional <-> not
Modified Paths:
--------------
trunk/sc2/src/libs/sound/openal/audiodrv_openal.c
trunk/sc2/src/libs/sound/openal/audiodrv_openal.h
trunk/sc2/src/libs/sound/sfx.c
Modified: trunk/sc2/src/libs/sound/openal/audiodrv_openal.c
===================================================================
--- trunk/sc2/src/libs/sound/openal/audiodrv_openal.c 2011-07-09 02:32:58 UTC (rev 3638)
+++ trunk/sc2/src/libs/sound/openal/audiodrv_openal.c 2011-07-09 03:49:12 UTC (rev 3639)
@@ -193,10 +193,7 @@
return -1;
}
- if (optStereoSFX)
- alDistanceModel (AL_INVERSE_DISTANCE);
- else
- alDistanceModel (AL_NONE);
+ alDistanceModel (AL_INVERSE_DISTANCE);
(void) driver; // eat compiler warning
Modified: trunk/sc2/src/libs/sound/openal/audiodrv_openal.h
===================================================================
--- trunk/sc2/src/libs/sound/openal/audiodrv_openal.h 2011-07-09 02:32:58 UTC (rev 3638)
+++ trunk/sc2/src/libs/sound/openal/audiodrv_openal.h 2011-07-09 03:49:12 UTC (rev 3639)
@@ -22,7 +22,6 @@
#include "config.h"
#include "libs/sound/sound.h"
-#include "options.h"
#include "endian_uqm.h"
#if defined (__APPLE__)
Modified: trunk/sc2/src/libs/sound/sfx.c
===================================================================
--- trunk/sc2/src/libs/sound/sfx.c 2011-07-09 02:32:58 UTC (rev 3638)
+++ trunk/sc2/src/libs/sound/sfx.c 2011-07-09 03:49:12 UTC (rev 3639)
@@ -29,6 +29,7 @@
static void CheckFinishedChannels (void);
+static const SoundPosition notPositional = {FALSE};
void
PlayChannel (COUNT channel, SOUND snd, SoundPosition pos,
@@ -50,8 +51,7 @@
soundSource[channel].sample = sample;
soundSource[channel].positional_object = positional_object;
- if (optStereoSFX)
- UpdateSoundPosition (channel, pos);
+ UpdateSoundPosition (channel, optStereoSFX ? pos : notPositional);
audio_Sourcei (soundSource[channel].handle, audio_BUFFER,
sample->buffer[0]);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <av...@us...> - 2011-07-09 02:33:04
|
Revision: 3638
http://sc2.svn.sourceforge.net/sc2/?rev=3638&view=rev
Author: avolkov
Date: 2011-07-09 02:32:58 +0000 (Sat, 09 Jul 2011)
Log Message:
-----------
Bugfix: positional SFX setup menu option should have an immediate effect
Modified Paths:
--------------
trunk/sc2/src/uqm/setupmenu.c
Modified: trunk/sc2/src/uqm/setupmenu.c
===================================================================
--- trunk/sc2/src/uqm/setupmenu.c 2011-07-09 02:29:10 UTC (rev 3637)
+++ trunk/sc2/src/uqm/setupmenu.c 2011-07-09 02:32:58 UTC (rev 3638)
@@ -1318,6 +1318,7 @@
optMeleeScale = (opts->meleezoom == OPTVAL_3DO) ? TFB_SCALE_TRILINEAR : TFB_SCALE_STEP;
optSpeech = (opts->speech == OPTVAL_ENABLED);
optWhichIntro = (opts->intro == OPTVAL_3DO) ? OPT_3DO : OPT_PC;
+ optStereoSFX = (opts->stereo == OPTVAL_ENABLED);
PlayerControls[0] = opts->player1;
PlayerControls[1] = opts->player2;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <av...@us...> - 2011-07-09 02:29:16
|
Revision: 3637
http://sc2.svn.sourceforge.net/sc2/?rev=3637&view=rev
Author: avolkov
Date: 2011-07-09 02:29:10 +0000 (Sat, 09 Jul 2011)
Log Message:
-----------
Added 'speech' config value which controls loading of 3dovoice addon; decoupled user option from actual presence of speech
Modified Paths:
--------------
trunk/sc2/ChangeLog
trunk/sc2/content/base/ui/setupmenu.txt
trunk/sc2/src/libs/sound/stream.c
trunk/sc2/src/libs/sound/stream.h
trunk/sc2/src/options.c
trunk/sc2/src/options.h
trunk/sc2/src/uqm/comm/starbas/starbas.c
trunk/sc2/src/uqm/comm/syreen/syreenc.c
trunk/sc2/src/uqm/comm.c
trunk/sc2/src/uqm/oscill.c
trunk/sc2/src/uqm/setup.c
trunk/sc2/src/uqm/setup.h
trunk/sc2/src/uqm/setupmenu.c
trunk/sc2/src/uqm/setupmenu.h
trunk/sc2/src/uqm.c
Modified: trunk/sc2/ChangeLog
===================================================================
--- trunk/sc2/ChangeLog 2011-07-08 22:23:28 UTC (rev 3636)
+++ trunk/sc2/ChangeLog 2011-07-09 02:29:10 UTC (rev 3637)
@@ -1,4 +1,6 @@
Changes towards version 0.8:
+- Added speech option which controls loading of 3dovoice addon (no need
+ to set speech volume to 0 anymore) - Alex
- Added the MetaChron story to the no-voice Melnorme script (bug #43) - Alex
0.7.0:
Modified: trunk/sc2/content/base/ui/setupmenu.txt
===================================================================
--- trunk/sc2/content/base/ui/setupmenu.txt 2011-07-08 22:23:28 UTC (rev 3636)
+++ trunk/sc2/content/base/ui/setupmenu.txt 2011-07-09 02:29:10 UTC (rev 3637)
@@ -34,6 +34,7 @@
Player Two
Control Set
UQM Remixes
+Speech
#(CAT_0_OPTS)
320x240
@@ -421,6 +422,20 @@
modern soundtrack written by The Precursors.
Requires a restart of UQM to take effect.
+#(CAT_22_OPTS)
+Disabled
+Enabled
+
+#(CAT_22_OPT_0_DESC)
+Do not load the 3DO Speech Pack.
+Uses script closer to PC version.
+Requires a restart of UQM to take effect.
+
+#(CAT_22_OPT_1_DESC)
+Use 3DO speech. The script is closer to 3DO
+version where there are differences.
+Requires a restart of UQM to take effect.
+
#(SLIDERS)
Music Volume
SFX Volume
Modified: trunk/sc2/src/libs/sound/stream.c
===================================================================
--- trunk/sc2/src/libs/sound/stream.c 2011-07-08 22:23:28 UTC (rev 3636)
+++ trunk/sc2/src/libs/sound/stream.c 2011-07-09 02:29:10 UTC (rev 3637)
@@ -593,7 +593,8 @@
// We use AGC because different pieces of music and speech can easily be
// at very different gain levels, because the game is moddable.
int
-GraphForegroundStream (uint8 *data, sint32 width, sint32 height)
+GraphForegroundStream (uint8 *data, sint32 width, sint32 height,
+ bool wantSpeech)
{
int source_num;
TFB_SoundSource *source;
@@ -634,7 +635,7 @@
source_num = SPEECH_SOURCE;
source = &soundSource[source_num];
LockMutex (source->stream_mutex);
- if (speechVolumeScale != 0.0f && (!source->sample ||
+ if (wantSpeech && (!source->sample ||
!source->sample->decoder || !source->sample->decoder->is_null))
{ // Use speech waveform, since it's available
// Step is picked experimentally. Using step of 1 sample at 11025Hz,
@@ -642,9 +643,10 @@
// better this way.
step = 1;
}
- else if (musicVolumeScale != 0.0f)
+ else
{ // We do not have speech -- use music waveform
UnlockMutex (source->stream_mutex);
+
source_num = MUSIC_SOURCE;
source = &soundSource[source_num];
LockMutex (source->stream_mutex);
@@ -653,11 +655,6 @@
// It looks better this way.
step = 4;
}
- else
- { // We do not have anything usable
- UnlockMutex (source->stream_mutex);
- return 0;
- }
if (!PlayingStream (source_num) || !source->sample
|| !source->sample->decoder || !source->sbuffer
Modified: trunk/sc2/src/libs/sound/stream.h
===================================================================
--- trunk/sc2/src/libs/sound/stream.h 2011-07-08 22:23:28 UTC (rev 3636)
+++ trunk/sc2/src/libs/sound/stream.h 2011-07-09 02:29:10 UTC (rev 3637)
@@ -28,7 +28,8 @@
void SeekStream (uint32 source, uint32 pos);
BOOLEAN PlayingStream (uint32 source);
-int GraphForegroundStream (uint8 *data, sint32 width, sint32 height);
+int GraphForegroundStream (uint8 *data, sint32 width, sint32 height,
+ bool wantSpeech);
// returns TRUE if the fade was accepted by stream decoder
bool SetMusicStreamFade (sint32 howLong, int endVolume);
Modified: trunk/sc2/src/options.c
===================================================================
--- trunk/sc2/src/options.c 2011-07-08 22:23:28 UTC (rev 3636)
+++ trunk/sc2/src/options.c 2011-07-09 02:29:10 UTC (rev 3637)
@@ -54,6 +54,7 @@
BOOLEAN opt3doMusic;
BOOLEAN optRemixMusic;
+BOOLEAN optSpeech;
BOOLEAN optSubtitles;
BOOLEAN optStereoSFX;
BOOLEAN optKeepAspectRatio;
Modified: trunk/sc2/src/options.h
===================================================================
--- trunk/sc2/src/options.h 2011-07-08 22:23:28 UTC (rev 3636)
+++ trunk/sc2/src/options.h 2011-07-09 02:29:10 UTC (rev 3637)
@@ -40,6 +40,7 @@
extern BOOLEAN opt3doMusic;
extern BOOLEAN optRemixMusic;
+extern BOOLEAN optSpeech;
extern BOOLEAN optSubtitles;
extern BOOLEAN optStereoSFX;
extern BOOLEAN optKeepAspectRatio;
Modified: trunk/sc2/src/uqm/comm/starbas/starbas.c
===================================================================
--- trunk/sc2/src/uqm/comm/starbas/starbas.c 2011-07-08 22:23:28 UTC (rev 3636)
+++ trunk/sc2/src/uqm/comm/starbas/starbas.c 2011-07-09 02:29:10 UTC (rev 3637)
@@ -28,7 +28,6 @@
#include "libs/graphics/gfx_common.h"
#include "libs/mathlib.h"
#include "libs/inplib.h"
-#include "libs/sound/sound.h"
static void TellMission (RESPONSE_REF R);
@@ -214,7 +213,7 @@
}
NPCPhrase (pStr0);
- if (speechVolumeScale == 0.0f)
+ if (!usingSpeech)
{
NPCPhrase (SPACE);
NPCPhrase (GLOBAL_PLAYER_NAME);
@@ -900,7 +899,7 @@
else if (PLAYER_SAID (R, tell_me_about_crew))
{
NPCPhrase (ABOUT_CREW0);
- if (speechVolumeScale > 0.0f)
+ if (usingSpeech)
NPCPhrase (YOUR_FLAGSHIP_3DO2);
else {
NPCPhrase (YOUR_FLAGSHIP_PC);
@@ -1646,14 +1645,14 @@
if (GET_GAME_STATE (MOONBASE_ON_SHIP))
{
NPCPhrase (STARBASE_IS_READY_A);
- if (speechVolumeScale > 0.0f)
+ if (usingSpeech)
NPCPhrase (YOUR_FLAGSHIP_3DO1);
else {
NPCPhrase (YOUR_FLAGSHIP_PC);
NPCPhrase (GLOBAL_SHIP_NAME);
}
NPCPhrase (STARBASE_IS_READY_B);
- if (speechVolumeScale > 0.0f)
+ if (usingSpeech)
NPCPhrase (YOUR_FLAGSHIP_3DO0);
else
NPCPhrase (GLOBAL_SHIP_NAME);
@@ -1711,7 +1710,7 @@
break;
}
NPCPhrase (pStr0);
- if (speechVolumeScale == 0.0f)
+ if (!usingSpeech)
{
NPCPhrase (SPACE);
NPCPhrase (GLOBAL_PLAYER_NAME);
@@ -1914,7 +1913,7 @@
}
NPCPhrase (pStr1);
- if (speechVolumeScale == 0.0f)
+ if (!usingSpeech)
{
NPCPhrase (SPACE);
NPCPhrase (GLOBAL_PLAYER_NAME);
Modified: trunk/sc2/src/uqm/comm/syreen/syreenc.c
===================================================================
--- trunk/sc2/src/uqm/comm/syreen/syreenc.c 2011-07-08 22:23:28 UTC (rev 3636)
+++ trunk/sc2/src/uqm/comm/syreen/syreenc.c 2011-07-09 02:29:10 UTC (rev 3637)
@@ -20,8 +20,8 @@
#include "resinst.h"
#include "strings.h"
-#include "libs/sound/sound.h"
#include "uqm/build.h"
+#include "uqm/setup.h"
static LOCDATA syreen_desc =
@@ -652,7 +652,7 @@
else if (PLAYER_SAID (R, we_are_vindicator0))
{
NPCPhrase (WELCOME_VINDICATOR0);
- if (speechVolumeScale == 0.0f)
+ if (!usingSpeech)
{
NPCPhrase (GLOBAL_PLAYER_NAME);
NPCPhrase (WELCOME_VINDICATOR1);
Modified: trunk/sc2/src/uqm/comm.c
===================================================================
--- trunk/sc2/src/uqm/comm.c 2011-07-08 22:23:28 UTC (rev 3636)
+++ trunk/sc2/src/uqm/comm.c 2011-07-09 02:29:10 UTC (rev 3637)
@@ -46,8 +46,7 @@
#include <ctype.h>
#define MAX_RESPONSES 8
-#define BACKGROUND_VOL \
- (speechVolumeScale == 0.0f ? NORMAL_VOLUME : (NORMAL_VOLUME >> 1))
+#define BACKGROUND_VOL (usingSpeech ? (NORMAL_VOLUME / 2) : NORMAL_VOLUME)
#define FOREGROUND_VOL NORMAL_VOLUME
// Oscilloscope frame rate
Modified: trunk/sc2/src/uqm/oscill.c
===================================================================
--- trunk/sc2/src/uqm/oscill.c 2011-07-08 22:23:28 UTC (rev 3636)
+++ trunk/sc2/src/uqm/oscill.c 2011-07-09 02:29:10 UTC (rev 3637)
@@ -79,7 +79,8 @@
assert ((size_t)scopeSize.width <= sizeof scope_data);
assert (scopeSize.height < 256);
- if (GraphForegroundStream (scope_data, scopeSize.width, scopeSize.height))
+ if (GraphForegroundStream (scope_data, scopeSize.width, scopeSize.height,
+ usingSpeech))
{
int i;
CONTEXT oldContext;
Modified: trunk/sc2/src/uqm/setup.c
===================================================================
--- trunk/sc2/src/uqm/setup.c 2011-07-08 22:23:28 UTC (rev 3636)
+++ trunk/sc2/src/uqm/setup.c 2011-07-09 02:29:10 UTC (rev 3637)
@@ -72,7 +72,9 @@
uio_Repository *repository;
uio_DirHandle *rootDir;
+BOOLEAN usingSpeech;
+
static void
InitPlayerInput (void)
{
@@ -119,9 +121,11 @@
loadAddon ("3domusic");
}
- /* Always try to use voice data */
- if (!loadAddon ("3dovoice"))
- speechVolumeScale = 0.0f; // XXX: need better no-speech indicator
+ usingSpeech = optSpeech;
+ if (optSpeech && !loadAddon ("3dovoice"))
+ {
+ usingSpeech = FALSE;
+ }
if (optRemixMusic)
{
Modified: trunk/sc2/src/uqm/setup.h
===================================================================
--- trunk/sc2/src/uqm/setup.h 2011-07-08 22:23:28 UTC (rev 3636)
+++ trunk/sc2/src/uqm/setup.h 2011-07-09 02:29:10 UTC (rev 3637)
@@ -58,6 +58,10 @@
extern BYTE PlayerControl[];
+extern BOOLEAN usingSpeech;
+ // Actual speech presence indicator which decouples reality from
+ // the user option, thus the user option remains as pure intent
+
BOOLEAN InitContexts (void);
void UninitPlayerInput (void);
BOOLEAN InitGameKernel (void);
Modified: trunk/sc2/src/uqm/setupmenu.c
===================================================================
--- trunk/sc2/src/uqm/setupmenu.c 2011-07-08 22:23:28 UTC (rev 3636)
+++ trunk/sc2/src/uqm/setupmenu.c 2011-07-09 02:29:10 UTC (rev 3637)
@@ -73,7 +73,7 @@
#endif
#define MENU_COUNT 8
-#define CHOICE_COUNT 22
+#define CHOICE_COUNT 23
#define SLIDER_COUNT 3
#define BUTTON_COUNT 10
#define LABEL_COUNT 4
@@ -96,7 +96,7 @@
static int choice_widths[CHOICE_COUNT] = {
3, 2, 3, 3, 2, 2, 2, 2, 2, 2,
2, 2, 3, 2, 2, 3, 3, 2, 3, 3,
- 3, 2 };
+ 3, 2, 2 };
static HANDLER button_handlers[BUTTON_COUNT] = {
quit_main_menu, quit_sub_menu, do_graphics, do_engine,
@@ -104,7 +104,7 @@
do_keyconfig };
static int menu_sizes[MENU_COUNT] = {
- 7, 5, 7, 9, 2, 5,
+ 7, 5, 8, 9, 2, 5,
#ifdef HAVE_OPENGL
5,
#else
@@ -140,6 +140,7 @@
(WIDGET *)(&choices[14]),
(WIDGET *)(&choices[9]),
(WIDGET *)(&choices[21]),
+ (WIDGET *)(&choices[22]),
(WIDGET *)(&buttons[1]) };
static WIDGET *engine_widgets[] = {
@@ -387,6 +388,7 @@
choices[19].selected = opts.player2;
choices[20].selected = 0;
choices[21].selected = opts.musicremix;
+ choices[22].selected = opts.speech;
sliders[0].value = opts.musicvol;
sliders[1].value = opts.sfxvol;
@@ -418,6 +420,7 @@
opts.player1 = choices[18].selected;
opts.player2 = choices[19].selected;
opts.musicremix = choices[21].selected;
+ opts.speech = choices[22].selected;
opts.musicvol = sliders[0].value;
opts.sfxvol = sliders[1].value;
@@ -1093,6 +1096,7 @@
/* These values are read in, but won't change during a run. */
opts->music3do = opt3doMusic ? OPTVAL_ENABLED : OPTVAL_DISABLED;
opts->musicremix = optRemixMusic ? OPTVAL_ENABLED : OPTVAL_DISABLED;
+ opts->speech = optSpeech ? OPTVAL_ENABLED : OPTVAL_DISABLED;
switch (snddriver) {
case audio_DRIVER_OPENAL:
opts->adriver = OPTVAL_OPENAL;
@@ -1312,6 +1316,7 @@
optSmoothScroll = (opts->scroll == OPTVAL_3DO) ? OPT_3DO : OPT_PC;
optWhichShield = (opts->shield == OPTVAL_3DO) ? OPT_3DO : OPT_PC;
optMeleeScale = (opts->meleezoom == OPTVAL_3DO) ? TFB_SCALE_TRILINEAR : TFB_SCALE_STEP;
+ optSpeech = (opts->speech == OPTVAL_ENABLED);
optWhichIntro = (opts->intro == OPTVAL_3DO) ? OPT_3DO : OPT_PC;
PlayerControls[0] = opts->player1;
PlayerControls[1] = opts->player2;
@@ -1324,6 +1329,7 @@
res_PutBoolean ("config.3domusic", opts->music3do == OPTVAL_ENABLED);
res_PutBoolean ("config.remixmusic", opts->musicremix == OPTVAL_ENABLED);
+ res_PutBoolean ("config.speech", opts->speech == OPTVAL_ENABLED);
res_PutBoolean ("config.3domovies", opts->intro == OPTVAL_3DO);
res_PutBoolean ("config.showfps", opts->fps == OPTVAL_ENABLED);
res_PutBoolean ("config.smoothmelee", opts->meleezoom == OPTVAL_3DO);
Modified: trunk/sc2/src/uqm/setupmenu.h
===================================================================
--- trunk/sc2/src/uqm/setupmenu.h 2011-07-08 22:23:28 UTC (rev 3636)
+++ trunk/sc2/src/uqm/setupmenu.h 2011-07-09 02:29:10 UTC (rev 3637)
@@ -74,7 +74,8 @@
OPT_DRIVERTYPE driver;
OPT_ADRIVERTYPE adriver;
OPT_AQUALITYTYPE aquality;
- OPT_ENABLABLE fullscreen, subtitles, scanlines, fps, stereo, music3do, musicremix;
+ OPT_ENABLABLE fullscreen, subtitles, scanlines, fps, stereo;
+ OPT_ENABLABLE music3do, musicremix, speech;
OPT_CONSOLETYPE menu, text, cscan, scroll, intro, meleezoom, shield;
CONTROL_TEMPLATE player1, player2;
int speechvol, musicvol, sfxvol;
Modified: trunk/sc2/src/uqm.c
===================================================================
--- trunk/sc2/src/uqm.c 2011-07-08 22:23:28 UTC (rev 3636)
+++ trunk/sc2/src/uqm.c 2011-07-09 02:29:10 UTC (rev 3637)
@@ -114,6 +114,7 @@
DECL_CONFIG_OPTION(int, soundQuality);
DECL_CONFIG_OPTION(bool, use3doMusic);
DECL_CONFIG_OPTION(bool, useRemixMusic);
+ DECL_CONFIG_OPTION(bool, useSpeech);
DECL_CONFIG_OPTION(int, whichCoarseScan);
DECL_CONFIG_OPTION(int, whichMenu);
DECL_CONFIG_OPTION(int, whichFonts);
@@ -247,6 +248,7 @@
INIT_CONFIG_OPTION( soundQuality, audio_QUALITY_MEDIUM ),
INIT_CONFIG_OPTION( use3doMusic, true ),
INIT_CONFIG_OPTION( useRemixMusic, false ),
+ INIT_CONFIG_OPTION( useSpeech, true ),
INIT_CONFIG_OPTION( whichCoarseScan, OPT_PC ),
INIT_CONFIG_OPTION( whichMenu, OPT_PC ),
INIT_CONFIG_OPTION( whichFonts, OPT_PC ),
@@ -368,6 +370,7 @@
// Fill in global variables:
opt3doMusic = options.use3doMusic.value;
optRemixMusic = options.useRemixMusic.value;
+ optSpeech = options.useSpeech.value;
optWhichCoarseScan = options.whichCoarseScan.value;
optWhichMenu = options.whichMenu.value;
optWhichFonts = options.whichFonts.value;
@@ -620,19 +623,13 @@
getBoolConfigValue (&options->use3doMusic, "config.3domusic");
getBoolConfigValue (&options->useRemixMusic, "config.remixmusic");
+ getBoolConfigValue (&options->useSpeech, "config.speech");
getBoolConfigValueXlat (&options->meleeScale, "config.smoothmelee",
TFB_SCALE_TRILINEAR, TFB_SCALE_STEP);
- if (getListConfigValue (&options->soundDriver, "config.audiodriver",
- audioDriverList))
- {
- // XXX: I don't know if we should turn speech off in this case.
- // This affects which version of the alien script will be used.
- if (options->soundDriver.value == audio_DRIVER_NOSOUND)
- options->speechVolumeScale.value = 0.0f;
- }
-
+ getListConfigValue (&options->soundDriver, "config.audiodriver",
+ audioDriverList);
getListConfigValue (&options->soundQuality, "config.audioquality",
audioQualityList);
getBoolConfigValue (&options->stereoSFX, "config.positionalsfx");
@@ -971,17 +968,9 @@
}
break;
case SOUND_OPT:
- if (setListOption (&options->soundDriver, optarg,
+ if (!setListOption (&options->soundDriver, optarg,
audioDriverList))
{
- // XXX: I don't know if we should turn speech off in
- // this case. This affects which version of the alien
- // script will be used.
- if (options->soundDriver.value == audio_DRIVER_NOSOUND)
- options->speechVolumeScale.value = 0.0f;
- }
- else
- {
InvalidArgument (optarg, "--sound");
badArg = true;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <av...@us...> - 2011-07-08 22:23:34
|
Revision: 3636
http://sc2.svn.sourceforge.net/sc2/?rev=3636&view=rev
Author: avolkov
Date: 2011-07-08 22:23:28 +0000 (Fri, 08 Jul 2011)
Log Message:
-----------
Audio drivers have no business setting channel volumes from user settings
Modified Paths:
--------------
trunk/sc2/src/libs/sound/audiocore.c
trunk/sc2/src/libs/sound/mixer/nosound/audiodrv_nosound.c
trunk/sc2/src/libs/sound/mixer/sdl/audiodrv_sdl.c
trunk/sc2/src/libs/sound/openal/audiodrv_openal.c
Modified: trunk/sc2/src/libs/sound/audiocore.c
===================================================================
--- trunk/sc2/src/libs/sound/audiocore.c 2011-07-08 20:49:41 UTC (rev 3635)
+++ trunk/sc2/src/libs/sound/audiocore.c 2011-07-08 22:23:28 UTC (rev 3636)
@@ -20,6 +20,7 @@
#include <stdio.h>
#include <stdlib.h>
#include "audiocore.h"
+#include "sound.h"
#include "libs/log.h"
static audio_Driver audiodrv;
@@ -76,6 +77,10 @@
"NOTICE: Try running UQM with '--sound=none' option");
exit (EXIT_FAILURE);
}
+
+ SetSFXVolume (sfxVolumeScale);
+ SetSpeechVolume (speechVolumeScale);
+ SetMusicVolume (musicVolume);
audio_inited = true;
Modified: trunk/sc2/src/libs/sound/mixer/nosound/audiodrv_nosound.c
===================================================================
--- trunk/sc2/src/libs/sound/mixer/nosound/audiodrv_nosound.c 2011-07-08 20:49:41 UTC (rev 3635)
+++ trunk/sc2/src/libs/sound/mixer/nosound/audiodrv_nosound.c 2011-07-08 22:23:28 UTC (rev 3636)
@@ -148,10 +148,6 @@
atexit (unInitAudio);
- SetSFXVolume (sfxVolumeScale);
- SetSpeechVolume (speechVolumeScale);
- SetMusicVolume ((COUNT)musicVolume);
-
PlaybackTask = AssignTask (PlaybackTaskFunc, 1024,
"nosound audio playback");
Modified: trunk/sc2/src/libs/sound/mixer/sdl/audiodrv_sdl.c
===================================================================
--- trunk/sc2/src/libs/sound/mixer/sdl/audiodrv_sdl.c 2011-07-08 20:49:41 UTC (rev 3635)
+++ trunk/sc2/src/libs/sound/mixer/sdl/audiodrv_sdl.c 2011-07-08 22:23:28 UTC (rev 3636)
@@ -212,10 +212,6 @@
atexit (unInitAudio);
- SetSFXVolume (sfxVolumeScale);
- SetSpeechVolume (speechVolumeScale);
- SetMusicVolume ((COUNT)musicVolume);
-
SDL_PauseAudio (0);
return 0;
Modified: trunk/sc2/src/libs/sound/openal/audiodrv_openal.c
===================================================================
--- trunk/sc2/src/libs/sound/openal/audiodrv_openal.c 2011-07-08 20:49:41 UTC (rev 3635)
+++ trunk/sc2/src/libs/sound/openal/audiodrv_openal.c 2011-07-08 22:23:28 UTC (rev 3636)
@@ -193,10 +193,6 @@
return -1;
}
- SetSFXVolume (sfxVolumeScale);
- SetSpeechVolume (speechVolumeScale);
- SetMusicVolume ((COUNT) musicVolume);
-
if (optStereoSFX)
alDistanceModel (AL_INVERSE_DISTANCE);
else
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <av...@us...> - 2011-07-08 20:49:47
|
Revision: 3635
http://sc2.svn.sourceforge.net/sc2/?rev=3635&view=rev
Author: avolkov
Date: 2011-07-08 20:49:41 +0000 (Fri, 08 Jul 2011)
Log Message:
-----------
Whitespace fix
Modified Paths:
--------------
trunk/sc2/src/uqm.c
Modified: trunk/sc2/src/uqm.c
===================================================================
--- trunk/sc2/src/uqm.c 2011-07-08 20:37:02 UTC (rev 3634)
+++ trunk/sc2/src/uqm.c 2011-07-08 20:49:41 UTC (rev 3635)
@@ -1013,7 +1013,7 @@
}
break;
}
- case SAFEMODE_OPT:
+ case SAFEMODE_OPT:
setBoolOption (&options->safeMode, true);
break;
#ifdef NETPLAY
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <av...@us...> - 2011-07-08 20:37:10
|
Revision: 3634
http://sc2.svn.sourceforge.net/sc2/?rev=3634&view=rev
Author: avolkov
Date: 2011-07-08 20:37:02 +0000 (Fri, 08 Jul 2011)
Log Message:
-----------
Added the MetaChron story to the no-voice Melnorme script; bug #43
Modified Paths:
--------------
trunk/sc2/ChangeLog
trunk/sc2/content/addons/3dovoice/3dovoice.rmp
trunk/sc2/content/base/comm/melnorme/melnorme.txt
Added Paths:
-----------
trunk/sc2/content/addons/3dovoice/melnorme/melnorme.txt
Modified: trunk/sc2/ChangeLog
===================================================================
--- trunk/sc2/ChangeLog 2011-07-07 19:25:08 UTC (rev 3633)
+++ trunk/sc2/ChangeLog 2011-07-08 20:37:02 UTC (rev 3634)
@@ -1,4 +1,7 @@
-Changes towards version 0.7:
+Changes towards version 0.8:
+- Added the MetaChron story to the no-voice Melnorme script (bug #43) - Alex
+
+0.7.0:
- Build with debug info in strict-debug mode (bug #1127), from Scott A. Colcord
- Added spoken Slylandro probe coordinates (bug #732) - Nic, Alex
- Added the missing bits to the no-voice versions of Mycon, Syreen and
Modified: trunk/sc2/content/addons/3dovoice/3dovoice.rmp
===================================================================
--- trunk/sc2/content/addons/3dovoice/3dovoice.rmp 2011-07-07 19:25:08 UTC (rev 3633)
+++ trunk/sc2/content/addons/3dovoice/3dovoice.rmp 2011-07-08 20:37:02 UTC (rev 3634)
@@ -4,7 +4,7 @@
comm.druuge.dialogue = CONVERSATION:base/comm/druuge/druuge.txt:addons/3dovoice/druuge/:addons/3dovoice/druuge/druuge.ts
comm.ilwrath.dialogue = CONVERSATION:base/comm/ilwrath/ilwrath.txt:addons/3dovoice/ilwrath/:addons/3dovoice/ilwrath/ilwrath.ts
comm.kohrah.dialogue = CONVERSATION:base/comm/kohrah/kohrah.txt:addons/3dovoice/kohrah/:addons/3dovoice/kohrah/kohrah.ts
-comm.melnorme.dialogue = CONVERSATION:base/comm/melnorme/melnorme.txt:addons/3dovoice/melnorme/:addons/3dovoice/melnorme/melnorme.ts
+comm.melnorme.dialogue = CONVERSATION:addons/3dovoice/melnorme/melnorme.txt:addons/3dovoice/melnorme/:addons/3dovoice/melnorme/melnorme.ts
comm.mycon.dialogue = CONVERSATION:addons/3dovoice/mycon/mycon.txt:addons/3dovoice/mycon/:addons/3dovoice/mycon/mycon.ts
comm.orz.dialogue = CONVERSATION:base/comm/orz/orz.txt:addons/3dovoice/orz/:addons/3dovoice/orz/orz.ts
comm.pkunk.dialogue = CONVERSATION:base/comm/pkunk/pkunk.txt:addons/3dovoice/pkunk/:addons/3dovoice/pkunk/pkunk.ts
Copied: trunk/sc2/content/addons/3dovoice/melnorme/melnorme.txt (from rev 3633, trunk/sc2/content/base/comm/melnorme/melnorme.txt)
===================================================================
--- trunk/sc2/content/addons/3dovoice/melnorme/melnorme.txt (rev 0)
+++ trunk/sc2/content/addons/3dovoice/melnorme/melnorme.txt 2011-07-08 20:37:02 UTC (rev 3634)
@@ -0,0 +1,1388 @@
+#(HELLO_NOW_DOWN_TO_BUSINESS_1) melnorme-000.ogg
+I am Trade Master Greenish in command of the Melnorme starship
+`Inevitably Successful in All Circumstances.'
+I bid you a formal welcome, Captain.
+Though we Melnorme have just recently arrived in this region of space
+we have long desired to make contact with your species
+and look forward to an extended profitable relationship.
+
+#(HELLO_NOW_DOWN_TO_BUSINESS_2) melnorme-001.ogg
+As a master trader in the Melnorme merchant fleet, I greet you, Captain.
+News of your species and your unusual vessel has travelled quickly.
+I need not say how eager we are to trade with you and your kind!
+Now, how can I be of service to you?
+
+#(HELLO_NOW_DOWN_TO_BUSINESS_3) melnorme-002.ogg
+Hello again, human space captain.
+Perhaps during this encounter, we will be able to establish a successful, businesslike relationship.
+
+#(KNOW_OF_YOU) melnorme-003.ogg
+Even before our first meeting, we knew of you, Captain.
+Though your struggle to free Earth shall be a long and difficult challenge
+fraught with great danger and mystery
+we have great confidence in you and your abilities.
+
+#(how_know)
+How did you know about us before meeting us?
+
+#(KNOW_BECAUSE) melnorme-004.ogg
+We gather information from a thousand secret sources in space and time.
+Our charge for revealing even one of these sources would be so high
+that your species would be in debt to us for centuries.
+
+#(what_about_yourselves)
+What can you tell us about yourselves?
+
+#(NO_TALK_ABOUT_OURSELVES) melnorme-005.ogg
+Our origins and purposes are, frankly, mysterious and due to several unavoidable factors
+we are unable to discuss ourselves in any great detail.
+
+#(what_factors)
+What are these 'unavoidable factors'?
+
+#(FACTORS_ARE) melnorme-006.ogg
+First and foremost among these factors
+is our unwillingness to GIVE away information
+about our history, psychology and mental powers,
+our unique physiology,
+the exact locations of homeworlds,
+or our potentially ominous, long-range plans.
+However, these important and relevant pieces of information
+ARE available, for a nominal sum of Credits.
+
+#(what_about_universe)
+Do you have any information which might be useful to us?
+
+#(NO_FREE_LUNCH) melnorme-007.ogg
+Absolutely.
+Our primary trade good IS information.
+Why, right here on my display screen, I have something
+which I am certain would be of incalculable value to you!
+We can discuss the details of this VERY significant information
+later, when we have established normal trading procedures
+at which time we shall also discuss the nature of our fees.
+
+#(giving_is_good_1)
+Fees! Surely your culture is far beyond such pettiness as money?
+
+#(GIVING_IS_BAD_1) melnorme-008.ogg
+You are of course correct.
+We long ago abandoned currency,
+and now only deal with commodities that have intrinsic value, such as valuable information.
+
+#(giving_is_good_2)
+But our cause is just! Isn't altruism the highest pinnacle of morality?
+
+#(GIVING_IS_BAD_2) melnorme-009.ogg
+No, it is not.
+In fact, in our culture, `giving'
+with no fair exchange of goods or services,
+is considered vulgar and inappropriate.
+Please do not mention this subject again.
+
+#(get_on_with_business)
+Shall we begin trading now?
+
+#(trade_is_for_the_weak)
+`Trade' is for the weak. We TAKE what we want!
+
+#(WERE_NOT_AFRAID) melnorme-010.ogg
+We reel with inchoate fear, and are thrown into a sudden panic.
+Being peaceful by nature
+we would no doubt be unprepared for your sudden hostility
+were it not for the excellent weapon system we bought from the Keel-Verezy just last month.
+A weapon system which is fully locked on your command bridge, by the way.
+
+#(no_trade_now)
+We cannot continue this conversation. Goodbye.
+
+#(OK_NO_TRADE_NOW_BYE) melnorme-011.ogg
+When you wish to trade with us, seek any supergiant star system.
+We shall be there.
+
+#(HELLO_AND_DOWN_TO_BUSINESS_1) melnorme-012.ogg
+Yes, let us get down to business.
+
+#(HELLO_AND_DOWN_TO_BUSINESS_2) melnorme-013.ogg
+How nice to see you again, Captain.
+
+#(HELLO_AND_DOWN_TO_BUSINESS_3) melnorme-014.ogg
+I had itchy pods this morning, Captain, and here you are!
+
+#(HELLO_AND_DOWN_TO_BUSINESS_4) melnorme-015.ogg
+What a coincidence! I was just talking about you with a Keel-Verezy captain.
+They expressed great interest in your explorations and struggles against the Ur-Quan
+but, like all Verezy, I'm afraid they were hesitant to introduce themselves for fear of
+well, frightening you.
+In any event, it is our pleasure to meet you once again.
+
+#(HELLO_AND_DOWN_TO_BUSINESS_5) melnorme-016.ogg
+Once again we meet to exchange valuable tangibles.
+Isn't this fun?!
+
+#(HELLO_AND_DOWN_TO_BUSINESS_6) melnorme-017.ogg
+Your arrival was predicted by our Tzo crystal's vibrations.
+We already know why you are here and what you need from us; however
+etiquette requires that we act as though we are ignorant of your desires.
+
+#(HELLO_AND_DOWN_TO_BUSINESS_7) melnorme-018.ogg
+This very morning, I was just saying to subordinate Ochre
+`Fe-Fi-Fo-Fum! I smell the feet of a Hu-Hu-Man!'
+We laughed and laughed. What a synchronicity!
+
+#(HELLO_AND_DOWN_TO_BUSINESS_8) melnorme-019.ogg
+I must warn you, Captain
+this is the time of the month we Melnorme drive exceptionally hard bargains.
+Beware!
+
+#(HELLO_AND_DOWN_TO_BUSINESS_9) melnorme-020.ogg
+LOOK OUT!
+Hoy! What a close call!
+Captain, why did you try to run down that Keel-Verezy vessel!?
+You almost smashed it into flinders!
+What!? You didn't see it? Surely you -- oh
+Never mind.
+
+#(HELLO_AND_DOWN_TO_BUSINESS_10) melnorme-021.ogg
+Welcome back, Captain! You are our favorite customer.
+
+#(whats_my_credit)
+What's my Credit balance, if you please?
+
+#(HELLO_SLIGHTLY_ANGRY_1) melnorme-022.ogg
+So, the violent one has returned.
+Have you come back to seek our forgiveness
+or to attack our defenseless vessel once more?
+
+#(HELLO_SLIGHTLY_ANGRY_2) melnorme-023.ogg
+You have disappointed us
+though to be truthful
+we had some hints that our relationship would be difficult at first
+due to your species' emotional immaturity.
+
+#(HELLO_SLIGHTLY_ANGRY_3) melnorme-024.ogg
+We require a formal apology.
+
+#(explore_relationship)
+Can we discuss establishing an alliance?
+
+#(EXAMPLE_OF_RELATIONSHIP) melnorme-025.ogg
+Your question reveals a certain lack of understanding
+about the nature of friendly, inter-species relationships.
+We shall clarify the situation.
+If you wish to be friends with someone
+never, EVER
+shoot wads of super-heated plasma at them.
+Is this clear?
+
+#(excuse_1)
+Look, mistakes happen. Don't get so bent out of shape!
+
+#(NO_EXCUSE_1) melnorme-026.ogg
+The Spathi once used a similar excuse
+after an unfortunate incident at their base on Algol IV.
+They didn't like the climate there
+so they decided to make `just a few minor, climatic adjustments.'
+Their equipment went haywire, they panicked and fled
+and the entire atmosphere was stripped off the planet
+much to the native Algolites sincere,
+though short-lived, regret.
+
+#(excuse_2)
+Let's just forget our battle ever happened, ok?
+
+#(NO_EXCUSE_2) melnorme-027.ogg
+No.
+
+#(excuse_3)
+What do you want from me, a formal apology?
+
+#(NO_EXCUSE_3) melnorme-028.ogg
+There is a small possibility that an apology would set things right.
+But it would have to be genuine.
+
+#(we_apologize)
+I apologize. I'm sorry. Please forgive me, I beg you.
+
+#(APOLOGY_ACCEPTED) melnorme-029.ogg
+Well, since you put it so nicely
+you seem so genuinely repentant
+we'll give you another chance to become trading partners with us.
+But don't ever attack us again
+Or the next time we won't be such nice guys.
+
+#(so_we_can_attack)
+This seems like a great opportunity to attack you again.
+
+#(DECEITFUL_HUMAN) melnorme-030.ogg
+Deceitful human!
+
+#(bye_melnorme_slightly_angry)
+I'm leaving now. Goodbye.
+
+#(MELNORME_SLIGHTLY_ANGRY_GOODBYE) melnorme-031.ogg
+Farewell, violent human.
+
+#(HELLO_HATE_YOU_1) melnorme-032.ogg
+We thought you were a nice guy.
+Boy, were we wrong!
+Now go away and leave us alone.
+
+#(HELLO_HATE_YOU_2) melnorme-033.ogg
+So, the jerk is back.
+What do you want from us this time?
+Never mind, we don't want to know.
+
+#(HELLO_HATE_YOU_3) melnorme-034.ogg
+We will hate you forever.
+It is no use coming back here in the hopes that we will ever change our minds.
+We won't!
+
+#(well_if_thats_the_way_you_feel)
+Die, eye-freak.
+
+#(you_hate_us_so_we_go_away)
+Goodbye.
+
+#(HATE_YOU_GOODBYE) melnorme-035.ogg
+Don't ever come back!
+
+#(WE_FIGHT_AGAIN) melnorme-036.ogg
+This time you shall pay for your transgressions!
+
+#(RESCUE_EXPLANATION) melnorme-037.ogg
+According to our scanners and other sensitive devices
+you are immobile in HyperSpace with no fuel reserves.
+This is a serious situation.
+Without fuel you shall drift here until your batteries exhaust themselves
+then your life-support will fail
+and you will expire
+unless, of course
+a hostile alien vessel finds you here helpless
+and annihilates you mercilessly.
+This has been known to happen.
+
+However
+as a gesture of good will, and in the spirit of friendship, we offer our assistance!
+For a nominal fee.
+
+#(RESCUE_AGAIN_1) melnorme-038.ogg
+Once more we find ourselves in a position to help you.
+How wonderful.
+
+#(RESCUE_AGAIN_2) melnorme-039.ogg
+Have you ever considered buying more fuel tanks?
+Just a friendly suggestion, Captain.
+
+#(RESCUE_AGAIN_3) melnorme-040.ogg
+We have come to help you once more, Captain.
+
+#(RESCUE_AGAIN_4) melnorme-041.ogg
+We MUST stop meeting like this, Captain!
+Ha, ha, ha!
+
+#(RESCUE_AGAIN_5) melnorme-042.ogg
+Out of fuel again, eh, Captain?
+
+#(CHANGED_MIND) melnorme-043.ogg
+Have you changed your mind
+and decided to accept our offer of assistance?
+
+#(no_changed_mind)
+No thanks, I don't need your help right now.
+
+#(yes_changed_mind)
+Perhaps I was hasty in refusing your offer. What was it again?
+
+#(SHOULD_WE_HELP_YOU) melnorme-044.ogg
+Would you like us to help you at this time?
+
+#(yes_help)
+Yes, I would appreciate your assistance. What is your fee?
+
+#(no_help)
+I don't need your help at this time. Maybe later, though.
+
+#(RESCUE_OFFER) melnorme-045.ogg
+You have no Credit balance in our mercantile computer
+and our scanners show that you possess no useful trade goods
+but, perhaps we can work out a special deal.
+In exchange for our giving you enough fuel to
+
+#(RESCUE_TANKS) melnorme-046.ogg
+fill your tanks, we will take:
+
+#(RESCUE_HOME) melnorme-047.ogg
+get you home, we will take:
+
+#(take_it)
+I find I have no choice. I accept your offer... grudgingly.
+
+#(leave_it)
+This offer is absurd! I refuse.
+
+#(HAPPY_TO_HAVE_RESCUED) melnorme-048.ogg
+The exchange of fuel for equipment is complete.
+As always, it is a pleasure doing business with you.
+Goodbye, Captain.
+
+#(MAYBE_SEE_YOU_LATER) melnorme-049.ogg
+Well then, we bid you farewell.
+We hope to see you again
+though with you sitting here, dead in space
+vulnerable and alone
+we won't hold our breath.
+
+#(GOODBYE_AND_GOODLUCK) melnorme-050.ogg
+Good luck, Captain.
+
+#(GOODBYE_AND_GOODLUCK_AGAIN) melnorme-051.ogg
+Until we meet again, Captain.
+
+#(HELLO_PISSED_OFF_1) melnorme-052.ogg
+The Human has returned.
+He hopes to either convince us of his sorrow over his past wrong-doings
+or he intends to compel us to give/render unreasonable bargains by force.
+
+#(HELLO_PISSED_OFF_2) melnorme-053.ogg
+Ahhh-YING!! Ahhh-YING! Ahhh-YING! Ahhh-Y
+Oh sorry, Captain. I was just meditating on the sorry state of your consciousness.
+Do you perceive any improvement?
+
+#(HELLO_PISSED_OFF_3) melnorme-054.ogg
+Perhaps I can be of some assistance to you in this time of confusion and travail
+either make a sincere apology to us, or depart.
+
+#(beg_forgiveness)
+We beg your forgiveness for our unwarranted aggression.
+
+#(LOTS_TO_MAKE_UP_FOR) melnorme-055.ogg
+Even if we were to accept your words as truth
+you have a lot to make up for.
+
+#(you_are_so_right)
+We stand prepared to make reparations for our previous conduct.
+
+#(ONE_LAST_CHANCE) melnorme-056.ogg
+Hmm
+hmm... hmm... hmm.
+Oh, very well then.
+We will give you a single opportunity to compensate us
+for the damages you have inflicted upon our mercantile fleet
+with your unreasonable attacks in the past.
+We will not make this offer a second time.
+You will give us all non-essential hardware from your vessel
+immediately!
+Do you accept?
+
+#(ok_strip_me)
+Ok, it's a deal, but ONLY the non-essentials!
+
+#(no_strip_now)
+What kind of sucker do you think I am? Forget it!
+
+#(NOT_WORTH_STRIPPING) melnorme-057.ogg
+It's not worth stripping.
+
+#(FAIR_JUSTICE) melnorme-058.ogg
+Removal of non-essential equipment is complete.
+We are satisfied with the exchange, and believe that we can now pursue
+a productive business relationship.
+We shall forget the mistakes you made in the past. Mostly.
+
+#(bye_melnorme_pissed_off)
+Goodbye.
+
+#(MELNORME_PISSED_OFF_GOODBYE) melnorme-059.ogg
+Good riddance.
+
+#(fight_some_more)
+Prepare to be destroyed.
+
+#(OK_FIGHT_SOME_MORE) melnorme-060.ogg
+No, YOU prepare to be destroyed!
+
+#(why_blue_light)
+Why did your bridge just turn blue?
+
+#(BLUE_IS_MAD) melnorme-061.ogg
+To us, blue ambience signifies a response to an unexpected threat
+it shows that we are under emotional distress
+and not incidentally
+it also lets us see our weapon consoles more clearly.
+
+#(we_strong_1)
+We have no fear of you, Melnorme!
+
+#(YOU_NOT_STRONG_1) melnorme-062.ogg
+Oh, you should.
+Once the Dramya thought they could steal from us.
+You don't see too many Dramya around these days, do you?
+
+#(we_strong_2)
+We have the most powerful ship in this part of the galaxy.
+
+#(YOU_NOT_STRONG_2) melnorme-063.ogg
+Perhaps that is true, but you have only one ship.
+
+#(we_strong_3)
+Why shouldn't we just take what we want from you by force?
+
+#(YOU_NOT_STRONG_3) melnorme-064.ogg
+Because it's against the law, and besides
+if you steal from us, the other Melnorme ships will have to raise their prices
+and other innocent space aliens will have to pay for your wrong-doing.
+Now that's not fair, is it?
+
+#(just_testing)
+Look, we were just testing your intentions. We're actually peaceful and friendly.
+
+#(REALLY_TESTING) melnorme-065.ogg
+You have an odd way of making friends, Captain.
+Are you certain that you aren't just tricking us
+so that you can attack us the moment our back is turned?
+
+#(yes_really_testing)
+I promise, we won't do anything sneaky like that.
+
+#(TEST_RESULTS) melnorme-066.ogg
+We believe you.
+
+#(youre_on)
+Let's just test out that weapon system, shall we?... IN COMBAT!
+
+#(YOU_GIVE_US_NO_CHOICE) melnorme-067.ogg
+You give us no choice.
+
+#(TRADING_INFO) melnorme-068.ogg
+Since this is your first time trading with us, let me explain how our system works.
+We are interested in purchasing certain items, specifically
+biological data on alien life forms
+and the coordinates of certain strange worlds whose radiant energies defy all scanners
+producing a rainbow-like image.
+In exchange, we have many interesting and valuable commodities, such as
+fuel compatible with your starship's HyperDrive thrusters,
+technological specifications, allowing you to build new devices for your ship
+and many important secrets which may help you in your travels.
+To facilitate trade, we translate all your sales into Interstar Credits
+with which you may make purchases.
+If you have any questions, don't hesitate to ask.
+
+#(BUY_OR_SELL) melnorme-069.ogg
+Now, what can we do for you today?
+
+#(goodbye)
+Goodbye, Trade Master.
+
+#(why_turned_purple)
+Why did your bridge turn purple?
+
+#(buy)
+I would like to make some purchases.
+
+#(sell)
+I have some items I would like to sell.
+
+#(TURNED_PURPLE_BECAUSE) melnorme-070.ogg
+That's a good question with a very interesting answer!
+The fee for this information is 12,000,000 Credits.
+
+#(NOTHING_TO_SELL) melnorme-071.ogg
+We appreciate your intentions, but you have nothing we wish to buy.
+
+#(WHAT_TO_SELL) melnorme-072.ogg
+What would you like to sell, Captain?
+
+#(OK_DONE_SELLING) melnorme-073.ogg
+As you wish.
+
+#(sell_life_data)
+I have some data on alien lifeforms.
+
+#(SOLD_LIFE_DATA1) melnorme-074.ogg
+The
+
+#(SOLD_LIFE_DATA2) melnorme-203.ogg
+ units of biological data we downloaded from your ship earn you
+
+#(SOLD_LIFE_DATA3) melnorme-204.ogg
+ Credits.
+
+#(sell_rainbow_locations)
+I wish to sell you Rainbow world locations.
+
+#(SOLD_RAINBOW_LOCATIONS1) melnorme-075.ogg
+Your ship's log indicates that you discovered the whereabouts of
+
+#(SOLD_RAINBOW_LOCATIONS2) melnorme-205.ogg
+ of the Rainbow worlds which so fascinate us.
+In exchange, we will give you
+
+#(SOLD_RAINBOW_LOCATIONS3) melnorme-204.ogg
+ Credits.
+
+#(sell_precursor_find)
+We found a Precursor artifact. Do you want it?
+
+#(SOLD_PRECURSOR_FIND) melnorme-076.ogg
+Always! Absolutely!
+In exchange we will give you
+N Credits
+
+#(changed_mind_no_sell)
+On second thought, I don't think I want to sell anything.
+
+#(done_selling)
+I am done selling, for now.
+
+#(NEED_CREDIT) melnorme-077.ogg
+You need Credits to purchase our trade items.
+To earn Credits you must sell us the items we desire, which are:
+biological data on alien lifeforms
+and the coordinates of certain strange worlds whose radiant energies defy all scanners
+producing a rainbow-like image.
+
+#(WHAT_TO_BUY) melnorme-078.ogg
+What trade items would you like to buy today?
+
+#(WHAT_MORE_TO_BUY) melnorme-079.ogg
+Would you like to purchase anything else?
+
+#(OK_DONE_BUYING) melnorme-080.ogg
+Very well then.
+
+#(buy_fuel)
+I'd like to buy some fuel.
+
+#(done_buying)
+I am done buying, for now.
+
+#(be_leaving_now)
+I shall be leaving now.
+
+#(HOW_MUCH_FUEL) melnorme-081.ogg
+How much fuel do you wish to purchase?
+
+#(buy_1_fuel)
+1 unit of fuel.
+
+#(GOT_FUEL) melnorme-082.ogg
+Fuel transferred to your vessel.
+
+#(buy_5_fuel)
+5 units of fuel.
+
+#(buy_10_fuel)
+10 units of fuel.
+
+#(buy_25_fuel)
+25 units of fuel.
+
+#(done_buying_fuel)
+I am done buying fuel.
+
+#(FRIENDLY_GOODBYE) melnorme-083.ogg
+It has been a pleasure dealing with you, Captain.
+We look forward to your next visit.
+
+#(CREDIT_IS0)
+Your present balance is
+#(CREDIT_IS1)
+ Credits.
+
+#(NEED_MORE_CREDIT0) melnorme-084.ogg
+Unfortunately this purchase requires
+#(NEED_MORE_CREDIT1) melnorme-206.ogg
+ additional Credits.
+
+#(BUY_FUEL_INTRO) melnorme-085.ogg
+As you know, we carry a large supply of fuel on board which is compatible with your engine system.
+We will be happy to sell this substance to you at a cost of 1 Credit per fuel unit.
+
+#(NO_ROOM_FOR_FUEL) melnorme-086.ogg
+Your ship's capacity is insufficient to hold that much fuel.
+
+#(buy_info)
+I wish to buy information.
+
+#(buy_technology)
+I am interested in purchasing new technology.
+
+#(buy_current_events)
+I wish to buy information about current events.
+
+#(buy_alien_races)
+I will pay for useful data on alien races.
+
+#(buy_history)
+Please sell us historical information.
+
+#(done_buying_info)
+I am done buying information.
+
+#(no_buy_info)
+I do not wish to buy information at this time.
+
+#(BUY_INFO_INTRO) melnorme-087.ogg
+As you know, in our many centuries of star-trading
+we Melnorme have come to learn much about what happens in our galaxy
+both now and in the ancient past.
+We have also kept records on the diverse alien races in your region of space.
+We will share this crucial knowledge with you for a fee of 75 Credits per informative fact.
+No refunds.
+
+#(OK_BUY_INFO) melnorme-088.ogg
+How wonderful, Captain!
+
+#(OK_NO_BUY_INFO) melnorme-089.ogg
+What else would you like to buy?
+
+#(OK_DONE_BUYING_INFO) melnorme-090.ogg
+What else would you like to buy?
+
+#(OK_BUY_EVENT_1) melnorme-091.ogg
+While you probably believe that the Shofixti are extinct
+having caused their sun to flare with a device identical to the Utwig's super-bomb
+the truth is not so simple.
+There yet exists a chance to resuscitate this meta-marsupial species, though it will not be easy.
+The problem at hand seems simple: bring together two Shofixti of different sexes
+and the carnal gymnastics proceed. Given the short gestation and maturation time of the Shofixti
+you will have thousands of the creatures in ten years, and millions in twenty.
+Finding a male of the species is easier than flup
+simply visit the Shofixti's blasted star system at Delta Gorno.
+Captain Tanaka or its sibling Katana shall greet you on your arrival.
+A warning! -- These warriors are old and fly in barely functional ships.
+If they mistakenly identify you as the enemy, do not return fire!
+Retreat and try to talk with them on their own level.
+The females of the species will be more difficult to obtain.
+The only supply of such remaining in the galaxy is at Alpha Cerenkov I
+included as part of General ZEX's bizarre and beloved menagerie.
+Fortunately for you, Captain, ZEX is considered... well... perverse, by his fellow VUX.
+This is because ZEX actually enjoys the presence of human beings.
+To acquire the Shofixti females, you will have to appease ZEX, or kill him.
+
+#(OK_BUY_EVENT_2) melnorme-092.ogg
+The Ur-Quan are presently at war with a race called the Kohr-Ah.
+They are fighting within a large spherical region of space centered around the Crateris star group.
+Although it is probably too early to tell, it would appear that the Kohr-Ah are winning.
+
+#(OK_BUY_EVENT_3) melnorme-093.ogg
+No doubt you are familiar with an alien race called the Umgah who live in the Orionis constellation.
+While they are renowned for their potent and often cruel sense of humor
+they have outdone themselves in recent years.
+Specifically, they have used an unusual HyperWave `Caster
+to impersonate the Ilwrath gods Dogar and Kazon.
+When the Ilwrath began tuning-in to `the voices of their gods' on their HyperWave receivers
+their priest caste was understandably skeptical
+and counselled their many followers to ignore the blasphemous signals.
+However, in a surprise move, the majority of the Ilwrath then rose up
+and slaughtered the entire priest caste.
+Their reasons for this ghastly move included over-taxation, lack of `quality death in ceremony'
+and the general feeling that the priests had made Dogar and Kazon's pronouncements overly complex.
+
+#(OK_BUY_EVENT_4) melnorme-094.ogg
+As you know, there are weaknesses in the division between dimensions.
+For example, your vessel uses such weaknesses to enter HyperSpace.
+However, there are other weak spots in the galaxy which lead to yet different dimensions.
+One such portal exists nearby, between the Chandrasekhar and Columbae constellations.
+The portal opens only a short time each month starting on the 17th.
+Since we have never entered the portal, we can give no more information on this subject.
+
+#(OK_BUY_EVENT_5) melnorme-095.ogg
+As you are probably aware, Ur-Quan starships -- you call them `Dreadnoughts', I believe
+possess effective self-annihilation circuits which prevent other races
+from reverse-engineering Ur-Quan technological secrets.
+However, we have become aware of a shipwrecked dreadnought which has remained largely intact.
+You will find the remains of the ship on the surface of a blue world orbiting Alpha Pavonis.
+We suspect you will find at least one item of interest there, possibly two.
+
+#(OK_BUY_EVENT_6) melnorme-096.ogg
+You may have noticed the presence of an increasingly large number of red probe vessels
+which move with great speed and attack relentlessly.
+We are sorry to say that this is our catalog item 2418-B.
+Do not blame us! We are not responsible for this violent folly!
+The product is not being used in a correct manner.
+Should you wish to confront the actual wrong-doers
+we suggest you search the planets in Beta Corvi for the probes' owners.
+
+#(OK_BUY_EVENT_7) melnorme-097.ogg
+Not more than fifty years ago
+the Druuge were informed by the now-extinct Burvixese race
+of a powerful alien nation called the Utwig.
+The Utwig, the Burvixese explained, were pleasant, sophisticated creatures
+but they were also terminally depressed and often spoke about ending their lives
+by activating a super-weapon, some kind of gigantic bomb
+which they had found on one of their worlds -- Zeta Hyades VI-B I think it was.
+The Druuge recognized the description of the bomb as a Precursor planeteering tool
+which indeed was an explosive device of unrivaled power, and they set out to make it their own.
+Though the revolting, criminal, insidious Druuge rarely leave their sphere of influence
+(it encompasses Algol, Almagest, and the Persei stars)
+they made a special trip on this occasion to the Aquarii constellation, where they made contact with the Utwig.
+There is a device commonly known as the `Ultron'.
+Is it now in your possession? Ah... I see.
+The Druuge sold this device to the Utwig, explaining that it was a Precursor `Personal Magnifier'
+which would enrich the lives of their entire culture in too many ways to describe specifically.
+The Utwig, I am sorry to say, fell for the Druuge's foul ruse, and snapped up the Ultron immediately.
+Fortunately for us all, the Utwig did not pay the Druuge's requested price -- the super-bomb
+and instead gave them a collection of `historical oddments and genuine artifacts'
+which to this day, the Druuge are trying to unload on unwary buyers.
+
+#(OK_BUY_EVENT_8) melnorme-098.ogg
+The Utwig, who live in the Aquarii constellation, have grown very depressed of late.
+They accidentally broke the supposed `Ultron' sold to them by the felonious Druuge.
+As a consequence, they are morose and melancholic
+and will probably be unwilling to help you fight the Ur-Quan.
+If you wish to gain them as allies, we recommend that you acquire the broken Ultron
+(as if it EVER worked)
+and find some suitable replacement parts.
+Our information indicates that you can find these items in three different places:
+a Rosy Sphere at the Druuge trade world
+an Aqua Helix somewhere in Thraddash space
+and a Clear Spindle, which is currently in the possession of the Pkunk.
+Captain, that was the last current event we have for sale.
+
+#(OK_BUY_ALIEN_RACE_1) melnorme-099.ogg
+The Zoq-Fot-Pik are a friendly co-op of three alien species all native to the same world.
+They are presently suffering severe collateral damage
+from the ritual combat between the Ur-Quan and the Kohr-Ah.
+While this is unfortunate for the Zoq-Fot-Pik -- they have been forced to abandon many of their worlds
+this close proximity to the inter-Ur-Quan war will give them insights into the conflict
+which will be of great use to you.
+In addition, the Zoq-Fot-Pik met the Chenjesu early on in the war, and are eager to make allies
+who can protect them from their enemies.
+In case you are interested, the Zoq-Fot-Pik homeworld is at coordinates 400.0:543.7, planet I.
+
+#(OK_BUY_ALIEN_RACE_2) melnorme-100.ogg
+The Ilwrath are presently attacking the Pkunk in the Lacaille and Krueger constellations.
+These beings have slavish devotion to their dark gods Dogar and Kazon
+which in the past few years has been used against them by the Umgah.
+If you need to manipulate the Ilwrath, we suggest you discover the Umgah's technique
+and duplicate it.
+
+#(OK_BUY_ALIEN_RACE_3) melnorme-101.ogg
+The Pkunk are a mystical off-shoot of the Yehat species
+who left their bird-brothers long ago to found a peaceful enclave in the Krueger and Giclas stars.
+At the present time, the Pkunk are defending themselves against the Ilwrath
+who have been commanded to attack the happy birds by Dogar and Kazon.
+The Pkunk may be unwilling to make a formal alliance with you
+but we have confidence that if you explain yourself honestly
+they will help your efforts against the Ur-Quan.
+
+#(OK_BUY_ALIEN_RACE_4) melnorme-102.ogg
+The creatures presently fighting the Ur-Quan are called the Kohr-Ah.
+They are an Ur-Quan sub-species who split off from the main species many thousands of years ago.
+Their present fight is a ritual reenacting of a major difference of opinion
+between two, rival Ur-Quan leaders after the Ur-Quan overwhelmed their slave-masters, the Dnyarri.
+The Kohr-Ah are immune to reason, having long ago lost the ability to see their situation objectively.
+They live in a self-maintained paradox: to ensure their safety and security
+the Kohr-Ah fight an endless battle against all other sentient species.
+
+#(OK_BUY_ALIEN_RACE_5) melnorme-103.ogg
+I must warn you about some very bad people.
+`Is this worth so many credits?' you ask yourself.
+I assure you, it is!
+The creatures are called the `Druuge' and they are a callous and evil race.
+They care for nothing but profit and personal gain through unfair mercantile exchanges..
+Why are you looking at me like that, Captain? It is not appropriate.
+As I was saying, these wicked creatures will try to sell you commodities at unreasonably low prices.
+Hoy! -- they almost give away fuel!
+Do not fall for their tricks! There are hidden costs -- secret tariffs!
+So that you may avoid them, I will tell you that their main trade world is Zeta Persei I.
+Why are you smiling, Captain?
+
+#(OK_BUY_ALIEN_RACE_6) melnorme-104.ogg
+The Burvixese race evolved on the planet Arcturus I.
+They lived there in a relatively benevolent manner
+until the Kohr-Ah came and destroyed them during the course of 2 or 3 unfortunate days.
+The Druuge were largely responsible for the Kohr-Ah finding the Burvixese.
+You see, the Burvixese were in long-distance HyperWave contact
+with a race known simply as the Gg.
+For decades the Gg and the Burvixese traded much valuable information
+until the Gg came under attack by an invading race who you may know as the Kohr-Ah.
+The Gg warned the Burvixese that the Kohr-Ah located races by their HyperWave transmissions
+and that they had already discovered the radiations from the Druuge.
+When the Burvixese were kind enough to warn the Druuge that a hostile alien race
+was homing in on their HyperWave radiations, the Druuge shut down all their transmitters
+and erected a powerful HyperWave beacon on the surface of the Burvixese moon.
+The Kohr-Ah changed course, attacked the poor Burvixese and sadly, destroyed them all.
+
+#(OK_BUY_ALIEN_RACE_7) melnorme-105.ogg
+The Thraddash are an arrogant, stubborn, and thick-skinned species
+who reside in the Draconis and Apodis star systems.
+They have little or no respect for anything but force, which they admire greatly.
+To make the Thraddash your friends, you should consider killing most, but not all of them.
+In addition, they guard some kind of sacred relic at the star system Zeta Draconis
+though we do not know the true nature of this artifact.
+The Thraddash homeworld is at Delta Draconis.
+
+#(OK_BUY_ALIEN_RACE_8) melnorme-106.ogg
+After the war, the Chenjesu and the Mmrnmhrm chose to be slave-shielded
+on the Chenjesu's homeworld at Procyon.
+We suspect that they are melding their two species to form some kind of new, hybrid race
+a race which may well be powerful enough to destroy the Ur-Quan single-handedly.
+However, by our calculations, this process will take many decades, if not centuries.
+Should you wish to talk to them, we recommend you invest in a
+HyperWave broadcasting system which is powerful enough to penetrate the shield around their world.
+
+#(OK_BUY_ALIEN_RACE_9) melnorme-107.ogg
+The Mycon are using this time while the Ur-Quan have their attention elsewhere
+to expand their sphere of influence as fast as possible.
+The Mycon colonize planets by launching tough spore-pods from orbit
+and injecting them under the planet's surface.
+Months later, after the spores have grown hundreds of thick, fibrous tendrils under the planet's crust
+the tendrils suddenly thrust up out of the planet and create huge calderas
+not incidentally filling the planet's atmosphere with the Mycon's preferred gases
+clouds of super-heated steam and sulphuric acid.
+
+#(OK_BUY_ALIEN_RACE_10) melnorme-108.ogg
+Following the end of the War, the Androsynth began experimenting with Inter-Dimensional Fatigue
+a process which is related to your faster-than-light drive
+but involves dimensions far more alien than HyperSpace.
+They had just made a major breakthrough when they were suddenly wiped out by a race called the Orz
+who appeared seemingly out of nowhere.
+Actually, we don't know what the Orz did to the Androsynth -- they're just all gone.
+
+#(OK_BUY_ALIEN_RACE_11) melnorme-109.ogg
+The Arilou Lalee'lay are a mysterious race of IDF beings
+IDF meaning, Inter-Dimensional Fatigue.
+They do not reside in this galaxy, or in fact, anywhere in this universe.
+While it is true that the Arilou are rarely seen far from the Columbae star group
+they do make regular, secret visits to your world, and have done so for centuries.
+Ever since Earth was slave-shielded, they have focused their attention
+on the humans aboard the starbase, many of whom are now members of your crew.
+Though the Arilou Lalee'lay always smile and are never overtly hostile
+we believe that they have a secret agenda which somehow involves your planet, Earth.
+These secret plans may or may not cause grief and woe to you Earthlings.
+
+#(OK_BUY_ALIEN_RACE_12) melnorme-110.ogg
+Just under 20 years ago, the brave and suicidal Shofixti annihilated their species
+by exploding a Precursor device -- some kind of bomb -- in the interior of their sun.
+The resulting storm of solar flares cooked the life off the Shofixti homeworld
+and incinerated over a hundred Ur-Quan Dreadnoughts
+which had just entered the system to conquer the Shofixti.
+In actuality, there are still at least a dozen Shofixti left alive in the galaxy.
+One or two are at Delta Gorno, guarding the dead hulk of their once beautiful world.
+Others can be found in VUX space.
+
+#(OK_BUY_ALIEN_RACE_13) melnorme-111.ogg
+The Slylandro are a mostly non-solid, sentient race who live in a gas giant at Beta Corvi.
+We recently sold them a self-replicating exploration probe
+which has somehow turned hostile and attacks everything it detects.
+If such encounters have angered you, Captain, please do NOT address your concerns to us.
+We possess a formal Waiver of Damages, authorized by a Slylandro Speaker
+and are in no way responsible for the situation.
+
+#(OK_BUY_ALIEN_RACE_14) melnorme-112.ogg
+The cowardly Spathi live at the single planet orbiting Epsilon Gruis.
+They do not actually live on their world, rather they reside on its airless moon.
+The reason? A xenomorphic species, which craves the sweet-flavored flesh of the Spathi
+has been transported to the surface of their planet
+and makes every attempt to devour the poor Spathi.
+I am certain that the Spathi would be forever in your debt
+if you were to eliminate these creatures from their planet.
+What? You fear the alien creatures will find you a treat also?
+Fear not. Our data reveals the beasts are not interested in your species.
+Should you wish to consult with the Spathi Ruling Council
+you will need to know the Secret Spathi Cypher -- a password, which is
+`Huffi-Muffi-Guffi'.
+
+#(OK_BUY_ALIEN_RACE_15) melnorme-113.ogg
+Like you Earthlings, when the war with the Ur-Quan was lost
+the Syreen chose to be slave-shielded. Their new world is at Betelgeuse.
+The Syreen's starbase is crewed by the starship commanders and crew
+who were decommissioned at the end of the war.
+Though the Syreen hate the Ur-Quan with a vengeance, they are unlikely to offer you assistance
+unless you reveal to them the truth behind the tragedy of their original homeworld, Syra
+which was destroyed by the birth of a Mycon `Deep Child' a century ago.
+
+#(OK_BUY_ALIEN_RACE_16) melnorme-114.ogg
+When the Ur-Quan entered Gamma Serpentis -- the home star of the Yehat
+their Queen made a sudden change of allegiance and allied with the Ur-Quan Hierarchy.
+They became Ur-Quan combat thralls.
+This act was viewed by most Yehat starship officers as ultimately dishonorable
+the desperate act of a corrupt regent to maintain her throne.
+The Yehat's shame was greatly magnified by the Shofixti's show of courage
+when they destroyed their own star system to slow down the Ur-Quan Armada.
+Captain, you have heard all that we have to say about aliens indigenous to this region.
+Should we learn more in the near future, we shall be certain to sell it to you.
+
+#(OK_BUY_HISTORY_1) melnorme-115.ogg
+Almost twenty-five thousand of your years ago, there existed near this region of space
+an association of starfaring races called the `Sentient Milieu'.
+This group formed over several thousand years to mutually enrich their respective cultures
+to provide a safe creche for emerging sentient species
+and to afford themselves a degree of protection from external hostilities via military alliance.
+Of the seven most active Milieu members, the most famous race -- indeed you know them well, Captain
+were the Ur-Quan.
+
+#(OK_BUY_HISTORY_2) melnorme-116.ogg
+The Ur-Quan evolved on a harsh planet orbiting a star outside this region of space.
+They were solitary predators, like your praying mantis, Captain, or polar bear
+who had a very limited set of social behaviors, most of which dealt with sex.
+Since they had to compete for survival against many physically superior species
+the Ur-Quan evolved intelligence and tool use, in much the same way as your own species.
+The Ur-Quan also learned to master their fierce territoriality to build a cooperative planetary culture.
+When the Ur-Quan were discovered by the Taalo, they had just begun exploring their solar system
+in crude atomic vehicles.
+Although the Ur-Quan attacked what they thought to be an invader, the Taalo were patient.
+They explained the purpose of the Sentient Milieu, and offered the Ur-Quan membership.
+The Ur-Quan recognized the benefits that such a system provided
+and once more conquered the hunting beast within themselves
+to become cooperative, productive members of the Milieu. This lasted for several thousands of years.
+
+#(OK_BUY_HISTORY_3) melnorme-117.ogg
+Just over twenty thousand years ago
+when your ancestors were learning to chart the course of the moon and stars on animal horns
+the Sentient Milieu spanned five hundred light years and included the membership of a hundred worlds.
+Like all other star-travellers, they had discovered ruins and relics of a far more ancient culture
+which your species calls the `Precursors'.
+Explorers from many species spent their lives trying to piece together this ancient mystery
+but of all races, the Ur-Quan were the most bold adventurers.
+Their scouts, flying single-ships, penetrated far into uncharted space, and landed on a million worlds.
+On one such mission, a young Ur-Quan made planetfall on a small, life-bearing alien world
+to identify some anomalous energy readings, occasionally a sign of Precursor installations.
+Instead the Ur-Quan found a small, hideous creature -- a Dnyarri.
+Before the scout was able to defend itself, the Dnyarri creature took control of the Ur-Quan's mind
+and commanded the scout to place the Dnyarri aboard the Ur-Quan's ship, along with hundreds of its evil brood.
+Then the Ur-Quan returned to the heart of the Milieu, landing on its capital planet.
+Within hours, every resident of the planet was a Dnyarri slave.
+Within a month, Dnyarri-compelled starships had spread the evil, psychic creatures across the entire Milieu.
+
+#(OK_BUY_HISTORY_4) melnorme-118.ogg
+When the Dnyarri took control over the Milieu, one race fought back -- the Taalo.
+These slow, quiet creatures were silicon-based life forms
+but bore little resemblance to the modern Chenjesu.
+The Taalo were natural immunes to the Dnyarri psychic compulsion; they were unaffected by the creatures' power
+and the Dnyarri would not permit anyone to exist outside their control
+so they ordered the remaining races of the Milieu to attack and destroy the Taalo home planet.
+This planet was one of the few Milieu worlds located in this region of space.
+I believe you call their star Delta Vulpeculae. Their home was a moon revolving about the second planet.
+I am sad to say that the Taalo were, indeed, eliminated.
+However, at the time of their devastation they had completed a device
+which they thought would give other races psychic immunity like their own.
+What happened to this device, this shield? It's hard to say.
+Maybe it was destroyed in the attack on their homeworld, maybe not.
+
+#(OK_BUY_HISTORY_5) melnorme-119.ogg
+In the Dnyarri's new empire, the Ur-Quan were the favored slaves.
+This is probably because the Ur-Quan were the most psychically sensitive, the most easily compelled.
+As the centuries of Dnyarri dominance passed, what was once the Sentient Milieu
+deteriorated and degenerated into a great galactic gulag.
+Alien races which did not serve with the efficiency and speed demanded by the Dnyarri
+were ruthlessly burned from the faces of their worlds.
+The agents of this genocide were inevitably the Dnyarri's favored pet, the Ur-Quan.
+After almost twenty-five hundred years of unrelenting Dnyarri control
+there were only four living member races of the once-great Sentient Milieu.
+By this point, the Dnyarri had used genetic manipulation to split the Ur-Quan into two sub-species:
+the Green Ur-Quan -- scientists, technicians, and administrators
+who were responsible for maintaining the limited infrastructure of the Dnyarri civilization
+and the Black Ur-Quan, who filled the ranks of basic laborer and combat soldier.
+Then, a chance discovery by an Ur-Quan named Kzer-Za
+led to the violent overthrow of the Dnyarri Slave Empire.
+
+#(OK_BUY_HISTORY_6) melnorme-120.ogg
+The Ur-Quan named Kzer-Za was a Green, a researcher specializing in repairing the mental damage
+inflicted by long-term exposure to the Dnyarri's psychic compulsion.
+By this point in history, the Dnyarri had grown lax in their dominance
+and on occasion accidentally permitted their slaves moments of self-direction.
+Kzer-Za was able to use those few scattered minutes to compose a theory.
+From its observations, Kzer-Za realized that when a slave died
+the Dnyarri `disconnected' from the slave's mind, lest it too be dragged down to death.
+Further, the Ur-Quan scientist uncovered the fact that when a slave underwent great pain
+the Dnyarri temporarily disconnected -- but that the degree of pain had to be extreme, nearly lethal.
+Kzer-Za chose its moment carefully -- it waited until it was near an open transmission unit.
+Then, in a short moment of mental freedom, the Ur-Quan injected itself with a dose of acidic poison
+sending incredible waves of pain through its long body.
+In the few moments before its death, Kzer-Za was able to wrest control of the transmitter
+to send word of its discovery across the planet, and into space as well.
+Before the Dnyarri knew what was happening
+Ur-Quan everywhere were hacking at their own bodies with chunks of glass, burning themselves horribly
+doing anything that would give them the few seconds of freedom necessary to find the nearest Dnyarri
+and crush the bleating creature.
+As they gained longer and longer periods of control, the Ur-Quan developed new tools and weapons
+to destroy their evil masters. The most gruesome of these devices was the Excruciator
+a mechanism which was inserted directly into the brain, and generated a constant stream of agony.
+The Dnyarri could not bring themselves to make the necessary mental connection with these tortured Ur-Quan.
+They were slaughtered by the thousands.
+The Ur-Quan Slave revolt was won.
+
+#(OK_BUY_HISTORY_7) melnorme-121.ogg
+When the last Ur-Quan was free of psychic compulsion -- when the last free Dnyarri was dead
+the combined might of the Ur-Quan star fleets met in orbit above the Dnyarri homeworld.
+They had come together to make two important decisions.
+First -- how to punish the few frightened Dnyarri left below on the planet's surface.
+Second -- how to ensure that never again would the Ur-Quan be made slaves.
+The first decision was made swiftly. The Dnyarri would not be allowed to die;
+ah, that was too kind a fate.
+Instead, the creatures would be genetically modified into sub-sentience
+they would become dumb animals.
+These low creatures would be further debased by serving the Ur-Quan for all eternity
+in the most demeaning way the Ur-Quan could imagine
+acting as translators, making physical contact with other species
+whom the Ur-Quan now considered grossly inferior to themselves and revolting.
+The second decision -- how to ensure their freedom permanently -- caused great turmoil.
+
+#(OK_BUY_HISTORY_8) melnorme-122.ogg
+Following the successful Ur-Quan slave revolt
+the Ur-Quan met to decide how to ensure their freedom.
+The Green Ur-Quan, who called themselves the Kzer-Za in honor of the Ur-Quan who triggered the revolt
+wished to establish the `Path of Now and Forever'
+which required that all other sentient species must become slaves of the Ur-Quan
+or be forever imprisoned beneath an impenetrable force shield.
+Leading the opposition to this plan was Kohr-Ah, a charismatic fleet officer.
+Kohr-Ah proposed a simpler alternative, the `Eternal Doctrine.'
+Simply put, this scheme called for the systematic eradication of all sentient life in the universe
+aside from the Ur-Quan.
+Captain, if these positions seem to you extreme or unwarranted
+you must remember that the Ur-Quan had been unwilling slaves for millenia
+and that each of them had to remain in agony for years in order to defeat the Dnyarri.
+The followers of Kzer-Za and Kohr-Ah were all on the brink of madness
+but neither side would submit, and so they fought a bloody civil war.
+
+#(OK_BUY_HISTORY_9) melnorme-123.ogg
+This is the last historical item we have for sale.
+The civil war between the Green Ur-Quan, the followers of Kzer-Za
+and their opponents, the death-dealing Kohr-Ah, lasted for decades.
+It is likely that they would have annihilated each other
+were it not for a chance discovery by a Kzer-Za -- a Precursor Battleship!
+The vessel was huge, many times the size of the Ur-Quan's vessels.
+The Precursor ship sliced through the Kohr-Ah forces in days -- the Kohr-Ah were defeated.
+However, in their victory the Kzer-Za were humble
+they realized that there was a chance that they were wrong, and the Kohr-Ah were right.
+Instead of destroying the Kohr-Ah, the Kzer-Za let them go
+directing them to make their way through the stars, travelling against the spin of the galaxy.
+The Kzer-Za would travel in the opposite direction
+and when the two Ur-Quan forces met, they would fight again in ritual combat
+with the Precursor Battleship given to the winner.
+Captain, this is happening here and now.
+The Kzer-Za, the Ur-Quan who enslaved Earth, are fighting their ritual battle against the Kohr-Ah
+in a large area centered near the Crateris constellation.
+If the Kohr-Ah win this battle, Captain, the Kzer-Za will stand aside and let them kill us all.
+We believe it is your destiny to prevent this from happening.
+
+#(INFO_ALL_GONE) melnorme-124.ogg
+We regret to say that you have exhausted our supply of genuinely valuable information.
+However we DO have many thousands of useless facts and that we will gladly sell you
+at a substantial discount. Are you interested?
+Hmm, we thought not.
+
+#(buy_new_tech)
+I would like to buy the technology you described.
+
+#(no_buy_new_tech)
+I do not want to purchase any more technology.
+
+#(done_buying_new_tech)
+I do not want to purchase any more technology.
+
+#(fill_me_up)
+Fill all my fuel tanks to maximum capacity.
+
+#(OK_FILL_YOU_UP) melnorme-125.ogg
+Yes sir, fill 'er up, right away!
+
+#(BUY_NEW_TECH_INTRO) melnorme-126.ogg
+Investment! Ah yes, you are so right.
+These technological breakthroughs don't cost you Credit
+they EARN you Credit!
+Of course... there is an initial charge
+but each technological system item is GUARANTEED
+to be useful for something important
+somewhere in the galaxy
+at some point in the future.
+All technologies cost 150 Credits.
+
+#(OK_BUY_NEW_TECH) melnorme-127.ogg
+Right now we are offering
+
+#(OK_NO_BUY_NEW_TECH) melnorme-128.ogg
+What else would you like to buy?
+
+#(OK_DONE_BUYING_NEW_TECH) melnorme-129.ogg
+Would you like to purchase anything else?
+
+#(OK_DONE_BUYING_FUEL) melnorme-130.ogg
+Would you like to purchase anything else?
+
+#(NEW_TECH_1) melnorme-131.ogg
+The technology we are now offering includes plans for building
+blaster weapons twice as powerful as your ion-bolt guns.
+
+#(NEW_TECH_2) melnorme-132.ogg
+The technology we are now offering includes specifications for constructing
+modifications to your planet landers which will double their speed.
+
+#(NEW_TECH_3) melnorme-133.ogg
+The technology we are now offering includes details on how to add
+'point-defense' laser defense systems for your flagship.
+
+#(NEW_TECH_4) melnorme-134.ogg
+The technology we are now offering includes plans for building
+improvements to your planet landers which make them resistant to hostile alien lifeforms.
+
+#(NEW_TECH_5) melnorme-135.ogg
+The technology we are now offering includes blueprints
+which show how to increase your lander's cargo space
+to double its present volume.
+
+#(NEW_TECH_6) melnorme-136.ogg
+The technology we are now offering includes blueprints which show how to add
+double-capacity fuel tanks.
+
+#(NEW_TECH_7) melnorme-137.ogg
+The technology we are now offering includes plans for improving the rate of fire
+on your lander's stunray bolt-beamer gun.
+
+#(NEW_TECH_8) melnorme-138.ogg
+The technology we are now offering includes details for building
+modifications to your planet landers which make them resistant to earthquakes.
+
+#(NEW_TECH_9) melnorme-139.ogg
+The technology we are now offering includes plans for adding
+auto-tracking modules which improve the aim of all your weapons.
+
+#(NEW_TECH_10) melnorme-140.ogg
+The technology we are now offering includes plans for adding
+improvements to your planet landers which make them resistant to inclement planet weather.
+
+#(NEW_TECH_11) melnorme-141.ogg
+The technology we are now offering is everything you need to know to assemble
+modifications to your planet landers which make them resistant to planetary hot-spots.
+
+#(NEW_TECH_12) melnorme-142.ogg
+The technology we are now offering is plans for building
+'Hellbore Cannons', a weapon much more destructive than a simple blaster.
+
+#(NEW_TECH_13) melnorme-143.ogg
+The technology we are now offering includes details on how to develop
+Shiva Furnace modules which generate energy for your combat batteries
+twice as fast as your standard dynamos.
+
+#(OK_BUY_NEW_TECH_1) melnorme-144.ogg
+Please remember that these weapons consume energy from your combat batteries
+faster than your familiar ion-bolt guns.
+You may wish to compensate for this by building additional dynamo modules for your flagship.
+
+#(OK_BUY_NEW_TECH_2) melnorme-145.ogg
+Ah yes, speed! An excellent choice for the relentless hunter
+and craven coward as well.
+These modifications are simple enough to be put in place immediately.
+Your landers should be properly equipped in no time.
+
+#(OK_BUY_NEW_TECH_3) melnorme-146.ogg
+These little babies are great for defense, but because of their limited range
+they may not make a good offensive weapon.
+However, the more you build for your vessel the more damage each laser strike will do.
+
+#(OK_BUY_NEW_TECH_4) melnorme-147.ogg
+Our reinforcement procedures on your landers are complete.
+Now, provided your crew will stop putting their hands out the windows
+they will be much better protected against hostile lifeforms.
+
+#(OK_BUY_NEW_TECH_5) melnorme-148.ogg
+I hope this makes your resource gathering more cost-effective, Captain.
+
+#(OK_BUY_NEW_TECH_6) melnorme-149.ogg
+We hope that these improved tanks will make more module slots available on your flagship
+which you can fill with other, more useful equipment.
+
+#(OK_BUY_NEW_TECH_7) melnorme-150.ogg
+After some wild game, hmmm? Well, the changes we made should really make a difference!
+Unless of course that wiring went in backwards
+in which case you won't be able to shoot at all, or take off for that matter.
+Don't worry, Captain. We stand behind our work. If something goes wrong
+just bring it back to us, and we'll fix it pronto!
+
+#(OK_BUY_NEW_TECH_8) melnorme-151.ogg
+With the addition of these safety belts and heavy-duty shock absorbers
+your lander occupants should be much safer when an untimely earthquake strikes.
+The job is complete. Your landers are ready.
+
+#(OK_BUY_NEW_TECH_9) melnorme-152.ogg
+You are preparing for a mighty battle, eh?
+Well, let me give you some advice.
+You should consider using multiple Tracking modules, since this will greatly improve your aim
+however, never add more than three to your ship. Any more would be useless.
+
+#(OK_BUY_NEW_TECH_10) melnorme-153.ogg
+A little superconductive spray-paint and Presto!
+Your lander can sustain a direct hit by a lightning bolt
+without crisping the passengers inside... usually.
+Since the job is so easy that a nymph could do it
+I expect all your landers will be treated in less than an hour.
+
+#(OK_BUY_NEW_TECH_11) melnorme-154.ogg
+With these new ablative-plasma heat shields, your crew will be substantially safer on hot worlds
+but like all our lander modifications, this protection is not perfect, so remain cautious.
+Since the changes to your landers are straightforward
+your landers should be fitted with the heat shields by the time you return to your ship.
+
+#(OK_BUY_NEW_TECH_12) melnorme-155.ogg
+Captain, just a suggestion!
+Hellbore Cannon are energy gulpers, so unless you want to have a long delay between shots
+I would suggest you add Dynamos or even Shiva Furnaces to your ship.
+
+#(OK_BUY_NEW_TECH_13) melnorme-156.ogg
+I am certain you will appreciate this new module, Captain!
+With it you should be able to destroy and devastate twice as fast as before.
+
+#(CHARITY) melnorme-157.ogg
+Since you have no useful, easily removeable equipment on your vessel
+we have decided to provide you with fuel at no cost.
+Please do not make the mistake of thinking of this as a `gift' or act of altruism
+we are merely investing in our relationship with you, the customer.
+We are certain that in the long run, this will prove to be a most profitable investment.
+
+#(NEW_TECH_ALL_GONE) melnorme-158.ogg
+Commander, that is the limit of the new technology we can offer you.
+If I may say so, you have been an excellent customer.
+Thank you!
+
+#(we_are_from_alliance0)
+We come in peace, representing
+
+#(STRIP_HEAD) melnorme-159.ogg
+We will take
+
+#(LANDERS) melnorme-160.ogg
+ of your Planet Landers
+
+#(THRUSTERS) melnorme-161.ogg
+ of your Fusion Thrusters
+
+#(JETS) melnorme-162.ogg
+ of your Turning Jets
+
+#(PODS) melnorme-163.ogg
+ of your empty Crew Pods
+
+#(BAYS) melnorme-164.ogg
+ of your empty Storage Bays
+
+#(DYNAMOS) melnorme-165.ogg
+ of your Dynamo modules
+
+#(FURNACES) melnorme-166.ogg
+ of your Shiva Furnaces
+
+#(GUNS) melnorme-167.ogg
+ of your Ion-Bolt Guns
+
+#(BLASTERS) melnorme-168.ogg
+ of your Blasters
+
+#(CANNONS) melnorme-169.ogg
+ of your Hellbore Cannons
+
+#(TRACKERS) melnorme-170.ogg
+ of your Auto-Tracking Modules
+
+#(DEFENSES) melnorme-171.ogg
+ of your Point-Defense Lasers
+
+#(name_1)
+The New Alliance of Free Stars!
+
+#(name_2)
+The Concordance of Alien Nations!
+
+#(name_3)
+The United Federation of Worlds!
+
+#(name_40)
+The Empire of
+#(name_41)
+!
+
+#(ENUMERATE_ONE) melnorme-172.ogg
+one
+
+#(ENUMERATE_TWO) melnorme-173.ogg
+two
+
+#(ENUMERATE_THREE) melnorme-174.ogg
+three
+
+#(ENUMERATE_FOUR) melnorme-175.ogg
+four
+
+#(ENUMERATE_FIVE) melnorme-176.ogg
+five
+
+#(ENUMERATE_SIX) melnorme-177.ogg
+six
+
+#(ENUMERATE_SEVEN) melnorme-178.ogg
+seven
+
+#(ENUMERATE_EIGHT) melnorme-179.ogg
+eight
+
+#(ENUMERATE_NINE) melnorme-180.ogg
+nine
+
+#(ENUMERATE_TEN) melnorme-181.ogg
+ten
+
+#(ENUMERATE_ELEVEN) melnorme-182.ogg
+eleven
+
+#(ENUMERATE_TWELVE) melnorme-183.ogg
+twelve
+
+#(ENUMERATE_THIRTEEN) melnorme-184.ogg
+thirteen
+
+#(ENUMERATE_FOURTEEN) melnorme-185.ogg
+fourteen
+
+#(ENUMERATE_FIFTEEN) melnorme-186.ogg
+fifteen
+
+#(ENUMERATE_SIXTEEN) melnorme-187.ogg
+sixteen
+
+#(END_LIST_WITH_AND) melnorme-188.ogg
+and
+
+#(ENUMERATE_ZERO)
+zero
+
+#(ENUMERATE_SEVENTEEN) melnorme-190.ogg
+seventeen
+
+#(ENUMERATE_EIGHTEEN) melnorme-191.ogg
+eighteen
+
+#(ENUMERATE_NINETEEN) melnorme-192.ogg
+nineteen
+
+#(ENUMERATE_TWENTY) melnorme-193.ogg
+twenty
+
+#(ENUMERATE_THIRTY) melnorme-194.ogg
+thirty
+
+#(ENUMERATE_FOURTY) melnorme-195.ogg
+fourty
+
+#(ENUMERATE_FIFTY) melnorme-196.ogg
+fifty
+
+#(ENUMERATE_SIXTY) melnorme-197.ogg
+sixty
+
+#(ENUMERATE_SEVENTY) melnorme-198.ogg
+seventy
+
+#(ENUMERATE_EIGHTY) melnorme-199.ogg
+eighty
+
+#(ENUMERATE_NINETY) melnorme-200.ogg
+ninety
+
+#(ENUMERATE_HUNDRED) melnorme-201.ogg
+hundred
+
+#(ENUMERATE_THOUSAND) melnorme-202.ogg
+thousand
Modified: trunk/sc2/content/base/comm/melnorme/melnorme.txt
===================================================================
--- trunk/sc2/content/base/comm/melnorme/melnorme.txt 2011-07-07 19:25:08 UTC (rev 3633)
+++ trunk/sc2/content/base/comm/melnorme/melnorme.txt 2011-07-08 20:37:02 UTC (rev 3634)
@@ -105,6 +105,22 @@
#(HELLO_AND_DOWN_TO_BUSINESS_2) melnorme-013.ogg
How nice to see you again, Captain.
+Before we go on, I have a small announcement.
+As you may know, in our travels throughout the galaxy
+we Melnorme have found many strange and interesting alien artifacts.
+One of these devices is the MetaChron, a kind of trans-time alarm system.
+In a nutshell, it warns me of future dangers by predicting its own demise
+which is most likely linked to my own well being, since I keep it under my pillow.
+The unit is a small pyramid and, when all is well, white in color.
+B...
[truncated message content] |
|
From: <av...@us...> - 2011-07-07 19:25:14
|
Revision: 3633
http://sc2.svn.sourceforge.net/sc2/?rev=3633&view=rev
Author: avolkov
Date: 2011-07-07 19:25:08 +0000 (Thu, 07 Jul 2011)
Log Message:
-----------
Melnorme subtitle fixes: Dnyarri spelling, punctuation
Modified Paths:
--------------
trunk/sc2/content/base/comm/melnorme/melnorme.txt
Modified: trunk/sc2/content/base/comm/melnorme/melnorme.txt
===================================================================
--- trunk/sc2/content/base/comm/melnorme/melnorme.txt 2011-07-04 21:49:11 UTC (rev 3632)
+++ trunk/sc2/content/base/comm/melnorme/melnorme.txt 2011-07-07 19:25:08 UTC (rev 3633)
@@ -89,7 +89,7 @@
#(WERE_NOT_AFRAID) melnorme-010.ogg
We reel with inchoate fear, and are thrown into a sudden panic.
Being peaceful by nature
-We would no doubt be unprepared for your sudden hostility
+we would no doubt be unprepared for your sudden hostility
were it not for the excellent weapon system we bought from the Keel-Verezy just last month.
A weapon system which is fully locked on your command bridge, by the way.
@@ -305,7 +305,7 @@
#(RESCUE_OFFER) melnorme-045.ogg
You have no Credit balance in our mercantile computer
-and our scanners show you that you possess no useful trade goods
+and our scanners show that you possess no useful trade goods
but, perhaps we can work out a special deal.
In exchange for our giving you enough fuel to
@@ -844,7 +844,7 @@
#(OK_BUY_ALIEN_RACE_11) melnorme-109.ogg
The Arilou Lalee'lay are a mysterious race of IDF beings
-IDF meaning, Inter-Dimensional Fatigue
+IDF meaning, Inter-Dimensional Fatigue.
They do not reside in this galaxy, or in fact, anywhere in this universe.
While it is true that the Arilou are rarely seen far from the Columbae star group
they do make regular, secret visits to your world, and have done so for centuries.
@@ -952,8 +952,8 @@
When the Dnyarri took control over the Milieu, one race fought back -- the Taalo.
These slow, quiet creatures were silicon-based life forms
but bore little resemblance to the modern Chenjesu.
-The Taalo were natural immunes to the Dynarri psychic compulsion; they were unaffected by the creatures' power
-and the Dynarri would not permit anyone to exist outside their control
+The Taalo were natural immunes to the Dnyarri psychic compulsion; they were unaffected by the creatures' power
+and the Dnyarri would not permit anyone to exist outside their control
so they ordered the remaining races of the Milieu to attack and destroy the Taalo home planet.
This planet was one of the few Milieu worlds located in this region of space.
I believe you call their star Delta Vulpeculae. Their home was a moon revolving about the second planet.
@@ -970,7 +970,7 @@
deteriorated and degenerated into a great galactic gulag.
Alien races which did not serve with the efficiency and speed demanded by the Dnyarri
were ruthlessly burned from the faces of their worlds.
-The agents of this genocide were inevitably the Dynarri's favored pet, the Ur-Quan.
+The agents of this genocide were inevitably the Dnyarri's favored pet, the Ur-Quan.
After almost twenty-five hundred years of unrelenting Dnyarri control
there were only four living member races of the once-great Sentient Milieu.
By this point, the Dnyarri had used genetic manipulation to split the Ur-Quan into two sub-species:
@@ -987,7 +987,7 @@
and on occasion accidentally permitted their slaves moments of self-direction.
Kzer-Za was able to use those few scattered minutes to compose a theory.
From its observations, Kzer-Za realized that when a slave died
-the Dynarri `disconnected' from the slave's mind, lest it too be dragged down to death.
+the Dnyarri `disconnected' from the slave's mind, lest it too be dragged down to death.
Further, the Ur-Quan scientist uncovered the fact that when a slave underwent great pain
the Dnyarri temporarily disconnected -- but that the degree of pain had to be extreme, nearly lethal.
Kzer-Za chose its moment carefully -- it waited until it was near an open transmission unit.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
1 message has been excluded from this view by a project administrator.
