adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Indexing in the resources added since the ndx was created

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2032 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2005-12-05 14:46:22 +00:00
parent 50866c5a1d
commit 382a2afcbe
30 changed files with 60 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/content/comm/comandr.lst
+2
View File
@@ -4,3 +4,5 @@
1 0 6 comm/comandr/comandr.mod 1 0 6 comm/comandr/comandr.mod
2 1 4 comm/comandr/comandr.txt 2 1 4 comm/comandr/comandr.txt
3 2 4 comm/starbas/starbas.txt 3 2 4 comm/starbas/starbas.txt
4 1 6 comm/starbas/starbas.ogg
5 2 6 comm/comandr/comlowpw.ogg
sc2/content/comm/spathi.lst
+2
View File
@@ -5,3 +5,5 @@
2 1 4 comm/spahome/spahome.ct 2 1 4 comm/spahome/spahome.ct
2 2 4 comm/spahome/spahome.txt 2 2 4 comm/spahome/spahome.txt
3 0 6 comm/spathi/spathi.mod 3 0 6 comm/spathi/spathi.mod
4 1 6 comm/spahome/spahome.ogg
5 2 6 comm/spathi/spafwiff.ogg
sc2/content/comm/utwig.lst
+1
View File
@@ -2,3 +2,4 @@
1 0 3 comm/utwig/utwig.fon 1 0 3 comm/utwig/utwig.fon
1 0 4 comm/utwig/utwig.txt 1 0 4 comm/utwig/utwig.txt
1 0 6 comm/utwig/utwig.mod 1 0 6 comm/utwig/utwig.mod
2 1 6 comm/utwig/utwigult.ogg
sc2/content/comm/yehat.lst
+1
View File
@@ -3,3 +3,4 @@
1 0 6 comm/yehat/yehat.mod 1 0 6 comm/yehat/yehat.mod
2 0 4 comm/yehat/yehat.txt 2 0 4 comm/yehat/yehat.txt
3 1 4 comm/rebel/rebel.txt 3 1 4 comm/rebel/rebel.txt
4 1 6 comm/rebel/rebel.ogg
sc2/content/starcon.lst
+7
View File
@@ -58,6 +58,7 @@
41 20 2 ipanims/sis_ip.ani 41 20 2 ipanims/sis_ip.ani
41 21 2 ipanims/orbplan.ani 41 21 2 ipanims/orbplan.ani
41 22 2 ipanims/ip_sun.ani 41 22 2 ipanims/ip_sun.ani
41 96 4 ipanims/ip_sun.ct
42 2 5 ipanims/landsnds.snd 42 2 5 ipanims/landsnds.snd
42 23 2 ipanims/lander.ani 42 23 2 ipanims/lander.ani
42 24 2 ipanims/quake.ani 42 24 2 ipanims/quake.ani
@@ -206,6 +207,7 @@
160 5 6 ipanims/orbit3.mod 160 5 6 ipanims/orbit3.mod
160 6 6 ipanims/orbit4.mod 160 6 6 ipanims/orbit4.mod
160 7 6 ipanims/orbit5.mod 160 7 6 ipanims/orbit5.mod
161 14 6 melee/melemenu.ogg
161 72 2 melee/melebkgd.ani 161 72 2 melee/melebkgd.ani
162 73 2 melee/melee.ani 162 73 2 melee/melee.ani
163 8 6 lbm/redalert.mod 163 8 6 lbm/redalert.mod
@@ -239,6 +241,7 @@
190 49 7 sis.lst 190 49 7 sis.lst
191 50 7 lastbat.lst 191 50 7 lastbat.lst
192 51 7 probe.lst 192 51 7 probe.lst
193 15 6 lbm/mainmenu.ogg
193 76 2 lbm/newgame.ani 193 76 2 lbm/newgame.ani
194 77 2 lbm/modules.ani 194 77 2 lbm/modules.ani
195 78 2 lbm/sismods.ani 195 78 2 lbm/sismods.ani
@@ -246,6 +249,7 @@
196 9 6 lbm/outfit.mod 196 9 6 lbm/outfit.mod
197 80 2 lbm/sisblu.ani 197 80 2 lbm/sisblu.ani
197 81 2 lbm/shipyard.ani 197 81 2 lbm/shipyard.ani
197 97 4 lbm/dockpani.ct
198 10 6 lbm/shipyard.mod 198 10 6 lbm/shipyard.mod
199 11 6 lbm/starbase.mod 199 11 6 lbm/starbase.mod
199 82 2 lbm/starbase.ani 199 82 2 lbm/starbase.ani
@@ -452,3 +456,6 @@
280 282 2 lbm/credit18.ani 280 282 2 lbm/credit18.ani
281 283 2 lbm/credit19.ani 281 283 2 lbm/credit19.ani
282 13 6 lbm/credits.mod 282 13 6 lbm/credits.mod
283 284 2 slides/ending/sis_skel.ani
284 285 2 ipanims/orbenter.ani
285 286 2 lbm/setupmenu.ani
sc2/src/sc2code/comm.c
+1 -1
View File
@@ -1996,7 +1996,7 @@ HailAlien (void)
); );
if ((CommData.AlienSongFlags & LDASF_USE_ALTERNATE) if ((CommData.AlienSongFlags & LDASF_USE_ALTERNATE)
&& CommData.AlienAltSong) && CommData.AlienAltSong)
SongRef = LoadMusicFile (CommData.AlienAltSong); SongRef = LoadMusicInstance ((RESOURCE)CommData.AlienAltSong);
if (SongRef) if (SongRef)
CommData.AlienSong = SongRef; CommData.AlienSong = SongRef;
else else
sc2/src/sc2code/comm/comandr/comandr.c
+1 -1
View File
@@ -697,7 +697,7 @@ init_commander_comm ()
{ {
commander_desc.AlienAmbientArray[2].AnimFlags &= ~ANIM_DISABLED; commander_desc.AlienAmbientArray[2].AnimFlags &= ~ANIM_DISABLED;
// use alternate 'low-power' track if available // use alternate 'low-power' track if available
commander_desc.AlienAltSong = "comm/comandr/comlowpw.mod"; commander_desc.AlienAltSong = COMMANDER_LOWPOW_MUSIC;
commander_desc.AlienSongFlags |= LDASF_USE_ALTERNATE; commander_desc.AlienSongFlags |= LDASF_USE_ALTERNATE;
} }
sc2/src/sc2code/comm/comandr/imusicre.h
+2
View File
@@ -1,3 +1,5 @@
#define COMMANDER_MUSIC 0x00200006L #define COMMANDER_MUSIC 0x00200006L
#define STARBASE_ALT_MUSIC 0x00800106L
#define COMMANDER_LOWPOW_MUSIC 0x00a00206L
sc2/src/sc2code/comm/comandr/respkg.h
+3 -1
View File
@@ -2,6 +2,8 @@ enum
{ {
COMMANDER_PACKAGE = 1, COMMANDER_PACKAGE = 1,
COMMANDER_PHRASE_PACKAGE, COMMANDER_PHRASE_PACKAGE,
STARBASE_PHRASE_PACKAGE STARBASE_PHRASE_PACKAGE,
STARBASE_MUSIC_PACKAGE,
COMMANDER_LOWPOW_PACKAGE,
}; };
sc2/src/sc2code/comm/rebel/rebel.c
+1 -1
View File
@@ -436,7 +436,7 @@ init_rebel_yehat_comm (void)
yehat_desc.AlienTextWidth = (SIS_TEXT_WIDTH - 16) * 2 / 3; yehat_desc.AlienTextWidth = (SIS_TEXT_WIDTH - 16) * 2 / 3;
// use alternate "Rebels" track if available // use alternate "Rebels" track if available
yehat_desc.AlienAltSong = "comm/rebel/rebel.mod"; yehat_desc.AlienAltSong = REBEL_MUSIC;
yehat_desc.AlienSongFlags |= LDASF_USE_ALTERNATE; yehat_desc.AlienSongFlags |= LDASF_USE_ALTERNATE;
SET_GAME_STATE (BATTLE_SEGUE, 0); SET_GAME_STATE (BATTLE_SEGUE, 0);
sc2/src/sc2code/comm/spahome/spahome.c
+1 -1
View File
@@ -998,7 +998,7 @@ init_spahome_comm ()
spahome_desc.AlienTextWidth = SIS_TEXT_WIDTH - 16; spahome_desc.AlienTextWidth = SIS_TEXT_WIDTH - 16;
// use alternate "Safe Ones" track if available // use alternate "Safe Ones" track if available
spahome_desc.AlienAltSong = "comm/spahome/spahome.mod"; spahome_desc.AlienAltSong = SPAHOME_MUSIC;
spahome_desc.AlienSongFlags |= LDASF_USE_ALTERNATE; spahome_desc.AlienSongFlags |= LDASF_USE_ALTERNATE;
if (GET_GAME_STATE (SPATHI_MANNER) == 3) if (GET_GAME_STATE (SPATHI_MANNER) == 3)
sc2/src/sc2code/comm/spathi/imusicre.h
+3
View File
@@ -1,3 +1,6 @@
#define SPATHI_MUSIC 0x00600006L #define SPATHI_MUSIC 0x00600006L
#define SPAHOME_MUSIC 0x00800106L
#define FWIFFO_MUSIC 0x00a00206L
sc2/src/sc2code/comm/spathi/respkg.h
+3 -1
View File
@@ -2,6 +2,8 @@ enum
{ {
SPATHI_ART_PACKAGE = 1, SPATHI_ART_PACKAGE = 1,
SPATHI_HOME_ART_PACKAGE, SPATHI_HOME_ART_PACKAGE,
SPATHI_COMMON_PACKAGE SPATHI_COMMON_PACKAGE,
SPATHI_HOME_MUSIC_PACKAGE,
SPATHI_FWIFFO_MUSIC_PACKAGE,
}; };
sc2/src/sc2code/comm/spathi/spathic.c
+1 -1
View File
@@ -803,7 +803,7 @@ init_spathi_comm (void)
if (GET_GAME_STATE (FOUND_PLUTO_SPATHI) == 1) if (GET_GAME_STATE (FOUND_PLUTO_SPATHI) == 1)
{ // use alternate Fwiffo track if available { // use alternate Fwiffo track if available
spathi_desc.AlienAltSong = "comm/spathi/spafwiff.mod"; spathi_desc.AlienAltSong = FWIFFO_MUSIC;
spathi_desc.AlienSongFlags |= LDASF_USE_ALTERNATE; spathi_desc.AlienSongFlags |= LDASF_USE_ALTERNATE;
} }
else else
sc2/src/sc2code/comm/starbas/starbas.c
+1 -1
View File
@@ -1983,7 +1983,7 @@ init_starbase_comm ()
commander_desc.AlienTextTemplate.valign = VALIGN_MIDDLE; commander_desc.AlienTextTemplate.valign = VALIGN_MIDDLE;
// use alternate Starbase track if available // use alternate Starbase track if available
commander_desc.AlienAltSong = "comm/starbas/starbas.mod"; commander_desc.AlienAltSong = STARBASE_ALT_MUSIC;
commander_desc.AlienSongFlags |= LDASF_USE_ALTERNATE; commander_desc.AlienSongFlags |= LDASF_USE_ALTERNATE;
CurBulletinMask = 0; CurBulletinMask = 0;
sc2/src/sc2code/comm/utwig/imusicre.h
+2
View File
@@ -1,3 +1,5 @@
#define UTWIG_MUSIC 0x00200006L #define UTWIG_MUSIC 0x00200006L
#define UTWIG_ULTRON_MUSIC 0x00400106L
sc2/src/sc2code/comm/utwig/respkg.h
+2 -1
View File
@@ -1,5 +1,6 @@
enum enum
{ {
UTWIG_PACKAGE = 1 UTWIG_PACKAGE = 1,
UTWIG_ULTRON_MUSIC_PACKAGE,
}; };
sc2/src/sc2code/comm/utwig/utwigc.c
+1 -1
View File
@@ -966,7 +966,7 @@ init_utwig_comm (void)
if (GET_GAME_STATE (UTWIG_HAVE_ULTRON)) if (GET_GAME_STATE (UTWIG_HAVE_ULTRON))
{ // use alternate 'Happy Utwig!' track { // use alternate 'Happy Utwig!' track
utwig_desc.AlienAltSong = "comm/utwig/utwigult.mod"; utwig_desc.AlienAltSong = UTWIG_ULTRON_MUSIC;
utwig_desc.AlienSongFlags |= LDASF_USE_ALTERNATE; utwig_desc.AlienSongFlags |= LDASF_USE_ALTERNATE;
} }
else else
sc2/src/sc2code/comm/yehat/imusicre.h
+2
View File
@@ -1,3 +1,5 @@
#define YEHAT_MUSIC 0x00200006L #define YEHAT_MUSIC 0x00200006L
#define REBEL_MUSIC 0x00800106L
sc2/src/sc2code/comm/yehat/respkg.h
+2 -1
View File
@@ -2,6 +2,7 @@ enum
{ {
YEHAT_PACKAGE = 1, YEHAT_PACKAGE = 1,
YEHAT_PHRASE_PACKAGE, YEHAT_PHRASE_PACKAGE,
REBEL_PHRASE_PACKAGE REBEL_PHRASE_PACKAGE,
REBEL_MUSIC_PACKAGE,
}; };
sc2/src/sc2code/globdata.h
+1 -1
View File
@@ -130,7 +130,7 @@ typedef struct
COUNT AlienTextWidth; COUNT AlienTextWidth;
COLORMAP AlienColorMap; COLORMAP AlienColorMap;
DWORD AlienSong; DWORD AlienSong;
PVOID AlienAltSong; DWORD AlienAltSong;
LDAS_FLAGS AlienSongFlags; LDAS_FLAGS AlienSongFlags;
STRING ConversationPhrases; STRING ConversationPhrases;
sc2/src/sc2code/igfxres.h
+3
View File
@@ -283,4 +283,7 @@
#define CREDIT18_ANIM 0x23011a02L #define CREDIT18_ANIM 0x23011a02L
#define CREDIT19_ANIM 0x23211b02L #define CREDIT19_ANIM 0x23211b02L
#define SISSKEL_MASK_PMAP_ANIM 0x23611c02L
#define ORBENTER_PMAP_ANIM 0x23811d02L
#define MENUBKG_PMAP_ANIM 0x23a11e02L
sc2/src/sc2code/imusicre.h
+3
View File
@@ -13,4 +13,7 @@
#define BATTLE_MUSIC 0x20a00c06L #define BATTLE_MUSIC 0x20a00c06L
#define CREDITS_MUSIC 0x23400d06L #define CREDITS_MUSIC 0x23400d06L
#define MELEE_MUSIC 0x14200e06L
#define MAINMENU_MUSIC 0x18200f06L
sc2/src/sc2code/intro.c
+1 -1
View File
@@ -201,7 +201,7 @@ Present_GenerateSIS (PRESENTATION_INPUT_STATE* pPIS)
LockMutex (GraphicsLock); LockMutex (GraphicsLock);
OldContext = SetContext (OffScreenContext); OldContext = SetContext (OffScreenContext);
SkelFrame = CaptureDrawable (LoadCelFile ("slides/ending/sis_skel.ani")); SkelFrame = CaptureDrawable (LoadGraphic (SISSKEL_MASK_PMAP_ANIM));
ModuleFrame = CaptureDrawable (LoadGraphic (SISMODS_MASK_PMAP_ANIM)); ModuleFrame = CaptureDrawable (LoadGraphic (SISMODS_MASK_PMAP_ANIM));
GetFrameRect (SkelFrame, &r); GetFrameRect (SkelFrame, &r);
sc2/src/sc2code/istrtab.h
+2
View File
@@ -95,4 +95,6 @@
#define RUINS_STRTAB 0x13a05e04L #define RUINS_STRTAB 0x13a05e04L
#define UMGAH_BCS_STRTAB 0x13c05f04L #define UMGAH_BCS_STRTAB 0x13c05f04L
#define IPSUN_COLOR_MAP 0x05206004L
#define HANGAR_COLOR_TAB 0x18a06104L
sc2/src/sc2code/melee.c
+1 -1
View File
@@ -1662,7 +1662,7 @@ DoMelee (PMELEE_STATE pMS)
DestroyMusic (pMS->hMusic); DestroyMusic (pMS->hMusic);
pMS->hMusic = 0; pMS->hMusic = 0;
} }
pMS->hMusic = LoadMusicFile ("melee/melemenu.ogg"); pMS->hMusic = LoadMusicInstance (MELEE_MUSIC);
pMS->Initialized = TRUE; pMS->Initialized = TRUE;
pMS->MeleeOption = START_MELEE; pMS->MeleeOption = START_MELEE;
sc2/src/sc2code/respkg.h
+4 -1
View File
@@ -299,6 +299,9 @@ enum
CREDIT17_PACKAGE, CREDIT17_PACKAGE,
CREDIT18_PACKAGE, CREDIT18_PACKAGE,
CREDIT19_PACKAGE, CREDIT19_PACKAGE,
CREDIT_MUSIC_PACKAGE CREDIT_MUSIC_PACKAGE,
SISSKEL_PACKAGE,
ORBENTER_PACKAGE,
MENUBKG_PACKAGE,
}; };
sc2/src/sc2code/restart.c
+1 -1
View File
@@ -134,7 +134,7 @@ DoRestart (PMENU_STATE pMS)
DestroyMusic (pMS->hMusic); DestroyMusic (pMS->hMusic);
pMS->hMusic = 0; pMS->hMusic = 0;
} }
pMS->hMusic = LoadMusicFile ("lbm/mainmenu.ogg"); pMS->hMusic = LoadMusicInstance (MAINMENU_MUSIC);
InactTimeOut = (pMS->hMusic ? 120 : 20) * ONE_SECOND; InactTimeOut = (pMS->hMusic ? 120 : 20) * ONE_SECOND;
PlayMusic (pMS->hMusic, TRUE, 1); PlayMusic (pMS->hMusic, TRUE, 1);
sc2/src/sc2code/setupmenu.c
+2 -2
View File
@@ -27,8 +27,8 @@
#include "libs/graphics/widgets.h" #include "libs/graphics/widgets.h"
#include "libs/graphics/tfb_draw.h" #include "libs/graphics/tfb_draw.h"
#include "libs/reslib.h" #include "libs/reslib.h"
#include "resinst.h"
#define MENU_BKG "lbm/setupmenu.ani"
typedef struct setup_menu_state { typedef struct setup_menu_state {
BOOLEAN (*InputFunc) (struct setup_menu_state *pInputState); BOOLEAN (*InputFunc) (struct setup_menu_state *pInputState);
@@ -503,7 +503,7 @@ DoSetupMenu (PSETUP_MENU_STATE pInputState)
} }
if (!menu.bgStamp.frame) if (!menu.bgStamp.frame)
{ {
FRAME f = CaptureDrawable (LoadCelFile (MENU_BKG)); FRAME f = CaptureDrawable (LoadGraphic (MENUBKG_PMAP_ANIM));
menu.bgStamp.origin.x = 0; menu.bgStamp.origin.x = 0;
menu.bgStamp.origin.y = 0; menu.bgStamp.origin.y = 0;
menu.bgStamp.frame = SetAbsFrameIndex (f, 0); menu.bgStamp.frame = SetAbsFrameIndex (f, 0);
sc2/src/sc2code/shipyard.c
+3 -2
View File
@@ -25,6 +25,7 @@
#include "melee.h" #include "melee.h"
#include "options.h" #include "options.h"
#include "races.h" #include "races.h"
#include "nameref.h"
#include "resinst.h" #include "resinst.h"
#include "settings.h" #include "settings.h"
#include "setup.h" #include "setup.h"
@@ -1210,8 +1211,8 @@ DoShipyard (PMENU_STATE pMS)
s.frame = CaptureDrawable (LoadGraphic (SHIPYARD_PMAP_ANIM)); s.frame = CaptureDrawable (LoadGraphic (SHIPYARD_PMAP_ANIM));
pMS->CurString = CaptureColorMap (LoadColorMapFile ( pMS->CurString = CaptureColorMap (
contentDir, "lbm/dockpani.ct")); LoadColorMap (HANGAR_COLOR_TAB));
pMS->hMusic = LoadMusicInstance (SHIPYARD_MUSIC); pMS->hMusic = LoadMusicInstance (SHIPYARD_MUSIC);