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/src/sc2code/comm.c
+1 -1
View File
@@ -1996,7 +1996,7 @@ HailAlien (void)
);
if ((CommData.AlienSongFlags & LDASF_USE_ALTERNATE)
&& CommData.AlienAltSong)
SongRef = LoadMusicFile (CommData.AlienAltSong);
SongRef = LoadMusicInstance ((RESOURCE)CommData.AlienAltSong);
if (SongRef)
CommData.AlienSong = SongRef;
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;
// 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;
}
sc2/src/sc2code/comm/comandr/imusicre.h
+2
View File
@@ -1,3 +1,5 @@
#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_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;
// use alternate "Rebels" track if available
yehat_desc.AlienAltSong = "comm/rebel/rebel.mod";
yehat_desc.AlienAltSong = REBEL_MUSIC;
yehat_desc.AlienSongFlags |= LDASF_USE_ALTERNATE;
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;
// 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;
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 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_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)
{ // use alternate Fwiffo track if available
spathi_desc.AlienAltSong = "comm/spathi/spafwiff.mod";
spathi_desc.AlienAltSong = FWIFFO_MUSIC;
spathi_desc.AlienSongFlags |= LDASF_USE_ALTERNATE;
}
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;
// 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;
CurBulletinMask = 0;
sc2/src/sc2code/comm/utwig/imusicre.h
+2
View File
@@ -1,3 +1,5 @@
#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
{
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))
{ // use alternate 'Happy Utwig!' track
utwig_desc.AlienAltSong = "comm/utwig/utwigult.mod";
utwig_desc.AlienAltSong = UTWIG_ULTRON_MUSIC;
utwig_desc.AlienSongFlags |= LDASF_USE_ALTERNATE;
}
else
sc2/src/sc2code/comm/yehat/imusicre.h
+2
View File
@@ -1,3 +1,5 @@
#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_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;
COLORMAP AlienColorMap;
DWORD AlienSong;
PVOID AlienAltSong;
DWORD AlienAltSong;
LDAS_FLAGS AlienSongFlags;
STRING ConversationPhrases;
sc2/src/sc2code/igfxres.h
+3
View File
@@ -283,4 +283,7 @@
#define CREDIT18_ANIM 0x23011a02L
#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 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);
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));
GetFrameRect (SkelFrame, &r);
sc2/src/sc2code/istrtab.h
+2
View File
@@ -95,4 +95,6 @@
#define RUINS_STRTAB 0x13a05e04L
#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);
pMS->hMusic = 0;
}
pMS->hMusic = LoadMusicFile ("melee/melemenu.ogg");
pMS->hMusic = LoadMusicInstance (MELEE_MUSIC);
pMS->Initialized = TRUE;
pMS->MeleeOption = START_MELEE;
sc2/src/sc2code/respkg.h
+4 -1
View File
@@ -299,6 +299,9 @@ enum
CREDIT17_PACKAGE,
CREDIT18_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);
pMS->hMusic = 0;
}
pMS->hMusic = LoadMusicFile ("lbm/mainmenu.ogg");
pMS->hMusic = LoadMusicInstance (MAINMENU_MUSIC);
InactTimeOut = (pMS->hMusic ? 120 : 20) * ONE_SECOND;
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/tfb_draw.h"
#include "libs/reslib.h"
#include "resinst.h"
#define MENU_BKG "lbm/setupmenu.ani"
typedef struct setup_menu_state {
BOOLEAN (*InputFunc) (struct setup_menu_state *pInputState);
@@ -503,7 +503,7 @@ DoSetupMenu (PSETUP_MENU_STATE pInputState)
}
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.y = 0;
menu.bgStamp.frame = SetAbsFrameIndex (f, 0);
sc2/src/sc2code/shipyard.c
+3 -2
View File
@@ -25,6 +25,7 @@
#include "melee.h"
#include "options.h"
#include "races.h"
#include "nameref.h"
#include "resinst.h"
#include "settings.h"
#include "setup.h"
@@ -1210,8 +1211,8 @@ DoShipyard (PMENU_STATE pMS)
s.frame = CaptureDrawable (LoadGraphic (SHIPYARD_PMAP_ANIM));
pMS->CurString = CaptureColorMap (LoadColorMapFile (
contentDir, "lbm/dockpani.ct"));
pMS->CurString = CaptureColorMap (
LoadColorMap (HANGAR_COLOR_TAB));
pMS->hMusic = LoadMusicInstance (SHIPYARD_MUSIC);