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

Resolved a resource name ambiguity between Yehat and Druuge cannons.

Browse Source 
The resulting .shp files do not change.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1915 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
mcmartin
2005-10-24 07:35:33 +00:00
parent 72d331204c
commit a641d5fa1a
6 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/ships/druuge/druuge.c
+3 -3
View File
@@ -72,9 +72,9 @@ static RACE_DESC druuge_desc =
(FRAME)DRUUGE_SML_MASK_PMAP_ANIM,
},
{
(FRAME)CANNON_BIG_MASK_PMAP_ANIM,
(FRAME)CANNON_MED_MASK_PMAP_ANIM,
(FRAME)CANNON_SML_MASK_PMAP_ANIM,
(FRAME)DRUUGE_CANNON_BIG_MASK_PMAP_ANIM,
(FRAME)DRUUGE_CANNON_MED_MASK_PMAP_ANIM,
(FRAME)DRUUGE_CANNON_SML_MASK_PMAP_ANIM,
},
{
(FRAME)0,
sc2/src/sc2code/ships/druuge/druuge.res
+3 -3
View File
@@ -12,9 +12,9 @@ PACKAGE DRUUGE_PACKAGE druuge.shp
GFXRES DRUUGE_BIG_MASK_PMAP_ANIM druuge.big
GFXRES DRUUGE_MED_MASK_PMAP_ANIM druuge.med
GFXRES DRUUGE_SML_MASK_PMAP_ANIM druuge.sml
GFXRES CANNON_BIG_MASK_PMAP_ANIM canbig.ani
GFXRES CANNON_MED_MASK_PMAP_ANIM canmed.ani
GFXRES CANNON_SML_MASK_PMAP_ANIM cansml.ani
GFXRES DRUUGE_CANNON_BIG_MASK_PMAP_ANIM canbig.ani
GFXRES DRUUGE_CANNON_MED_MASK_PMAP_ANIM canmed.ani
GFXRES DRUUGE_CANNON_SML_MASK_PMAP_ANIM cansml.ani
GFXRES DRUUGE_CAPT_MASK_PMAP_ANIM drucap.ani
SNDRES DRUUGE_SHIP_SOUNDS drusound.snd
sc2/src/sc2code/ships/druuge/igfxres.h
+3 -3
View File
@@ -3,9 +3,9 @@
#define DRUUGE_BIG_MASK_PMAP_ANIM 0x00400202L
#define DRUUGE_MED_MASK_PMAP_ANIM 0x00400302L
#define DRUUGE_SML_MASK_PMAP_ANIM 0x00400402L
#define CANNON_BIG_MASK_PMAP_ANIM 0x00400502L
#define CANNON_MED_MASK_PMAP_ANIM 0x00400602L
#define CANNON_SML_MASK_PMAP_ANIM 0x00400702L
#define DRUUGE_CANNON_BIG_MASK_PMAP_ANIM 0x00400502L
#define DRUUGE_CANNON_MED_MASK_PMAP_ANIM 0x00400602L
#define DRUUGE_CANNON_SML_MASK_PMAP_ANIM 0x00400702L
#define DRUUGE_CAPT_MASK_PMAP_ANIM 0x00400802L
sc2/src/sc2code/ships/yehat/igfxres.h
+3 -3
View File
@@ -3,9 +3,9 @@
#define YEHAT_BIG_MASK_PMAP_ANIM 0x00400202L
#define YEHAT_MED_MASK_PMAP_ANIM 0x00400302L
#define YEHAT_SML_MASK_PMAP_ANIM 0x00400402L
#define CANNON_BIG_MASK_PMAP_ANIM 0x00400502L
#define CANNON_MED_MASK_PMAP_ANIM 0x00400602L
#define CANNON_SML_MASK_PMAP_ANIM 0x00400702L
#define YEHAT_CANNON_BIG_MASK_PMAP_ANIM 0x00400502L
#define YEHAT_CANNON_MED_MASK_PMAP_ANIM 0x00400602L
#define YEHAT_CANNON_SML_MASK_PMAP_ANIM 0x00400702L
#define SHIELD_BIG_MASK_ANIM 0x00400802L
#define SHIELD_MED_MASK_ANIM 0x00400902L
#define SHIELD_SML_MASK_ANIM 0x00400a02L
sc2/src/sc2code/ships/yehat/yehat.c
+3 -3
View File
@@ -74,9 +74,9 @@ static RACE_DESC yehat_desc =
(FRAME)YEHAT_SML_MASK_PMAP_ANIM,
},
{
(FRAME)CANNON_BIG_MASK_PMAP_ANIM,
(FRAME)CANNON_MED_MASK_PMAP_ANIM,
(FRAME)CANNON_SML_MASK_PMAP_ANIM,
(FRAME)YEHAT_CANNON_BIG_MASK_PMAP_ANIM,
(FRAME)YEHAT_CANNON_MED_MASK_PMAP_ANIM,
(FRAME)YEHAT_CANNON_SML_MASK_PMAP_ANIM,
},
{
(FRAME)SHIELD_BIG_MASK_ANIM,
sc2/src/sc2code/ships/yehat/yehat.res
+3 -3
View File
@@ -12,9 +12,9 @@ PACKAGE YEHAT_PACKAGE yehat.shp
GFXRES YEHAT_BIG_MASK_PMAP_ANIM yehat.big
GFXRES YEHAT_MED_MASK_PMAP_ANIM yehat.med
GFXRES YEHAT_SML_MASK_PMAP_ANIM yehat.sml
GFXRES CANNON_BIG_MASK_PMAP_ANIM missile.big
GFXRES CANNON_MED_MASK_PMAP_ANIM missile.med
GFXRES CANNON_SML_MASK_PMAP_ANIM missile.sml
GFXRES YEHAT_CANNON_BIG_MASK_PMAP_ANIM missile.big
GFXRES YEHAT_CANNON_MED_MASK_PMAP_ANIM missile.med
GFXRES YEHAT_CANNON_SML_MASK_PMAP_ANIM missile.sml
GFXRES SHIELD_BIG_MASK_ANIM shield.big
GFXRES SHIELD_MED_MASK_ANIM shield.med
GFXRES SHIELD_SML_MASK_ANIM shield.sml