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

Ur-Quan Probe has been renamed to Drone to better match the game. This finishes the procedure

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3161 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2009-06-30 01:37:53 +00:00
parent fb9688751f
commit 81a1ada2c2
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/comm.c
+2 -2
View File
@@ -1444,9 +1444,9 @@ InitCommunication (CONVERSATION which_comm)
} }
} }
if (which_comm == URQUAN_PROBE_CONVERSATION) if (which_comm == URQUAN_DRONE_CONVERSATION)
{ {
status = URQUAN_PROBE_SHIP; status = URQUAN_DRONE_SHIP;
which_comm = URQUAN_CONVERSATION; which_comm = URQUAN_CONVERSATION;
} }
else else
sc2/src/sc2code/commglue.h
+1 -1
View File
@@ -48,7 +48,7 @@ typedef enum {
BLACKURQ_CONVERSATION, BLACKURQ_CONVERSATION,
TALKING_PET_CONVERSATION, TALKING_PET_CONVERSATION,
SLYLANDRO_HOME_CONVERSATION, SLYLANDRO_HOME_CONVERSATION,
URQUAN_PROBE_CONVERSATION, URQUAN_DRONE_CONVERSATION,
YEHAT_REBEL_CONVERSATION, YEHAT_REBEL_CONVERSATION,
INVALID_CONVERSATION, INVALID_CONVERSATION,
} CONVERSATION; } CONVERSATION;
sc2/src/sc2code/ipdisp.c
+2 -2
View File
@@ -184,7 +184,7 @@ ip_group_preprocess (ELEMENT *ElementPtr)
if (group_loc != 0) /* if in planetary views */ if (group_loc != 0) /* if in planetary views */
{ {
detect_dist *= (MAX_ZOOM_RADIUS / MIN_ZOOM_RADIUS); detect_dist *= (MAX_ZOOM_RADIUS / MIN_ZOOM_RADIUS);
if (GroupPtr->race_id == URQUAN_PROBE_SHIP) if (GroupPtr->race_id == URQUAN_DRONE_SHIP)
detect_dist <<= 1; detect_dist <<= 1;
} }
vdx = GLOBAL (ip_location.x) - GroupPtr->loc.x; vdx = GLOBAL (ip_location.x) - GroupPtr->loc.x;
@@ -545,7 +545,7 @@ ip_group_collision (ELEMENT *ElementPtr0, POINT *pPt0,
{ {
EncounterGroup = GroupPtr->group_id; EncounterGroup = GroupPtr->group_id;
if (GroupPtr->race_id == URQUAN_PROBE_SHIP) if (GroupPtr->race_id == URQUAN_DRONE_SHIP)
{ {
GroupPtr->task = FLEE | IGNORE_FLAGSHIP; GroupPtr->task = FLEE | IGNORE_FLAGSHIP;
GroupPtr->dest_loc = 0; GroupPtr->dest_loc = 0;
sc2/src/sc2code/planets/gensol.c
+1 -1
View File
@@ -413,7 +413,7 @@ GenerateSOL (BYTE control)
GET_GAME_STATE_32 (URQUAN_PROBE_GRPOFFS0); GET_GAME_STATE_32 (URQUAN_PROBE_GRPOFFS0);
if (GLOBAL (BattleGroupRef) == 0) if (GLOBAL (BattleGroupRef) == 0)
{ {
CloneShipFragment (URQUAN_PROBE_SHIP, CloneShipFragment (URQUAN_DRONE_SHIP,
&GLOBAL (npc_built_ship_q), 0); &GLOBAL (npc_built_ship_q), 0);
GLOBAL (BattleGroupRef) = PutGroupInfo (GROUPS_ADD_NEW, 1); GLOBAL (BattleGroupRef) = PutGroupInfo (GROUPS_ADD_NEW, 1);
ReinitQueue (&GLOBAL (npc_built_ship_q)); ReinitQueue (&GLOBAL (npc_built_ship_q));
sc2/src/sc2code/races.h
+7 -7
View File
@@ -392,8 +392,8 @@ enum
SYREEN_SHIP, SYREEN_SHIP,
BLACK_URQUAN_SHIP, BLACK_URQUAN_SHIP,
YEHAT_REBEL_SHIP, YEHAT_REBEL_SHIP,
URQUAN_PROBE_SHIP, URQUAN_DRONE_SHIP,
SAMATRA_SHIP = URQUAN_PROBE_SHIP, SAMATRA_SHIP = URQUAN_DRONE_SHIP,
NUM_AVAILABLE_RACES NUM_AVAILABLE_RACES
}; };
@@ -422,7 +422,7 @@ enum
INVALID_CONVERSATION, /* SYREEN_SHIP */ \ INVALID_CONVERSATION, /* SYREEN_SHIP */ \
BLACKURQ_CONVERSATION, /* BLACK_URQUAN_SHIP */ \ BLACKURQ_CONVERSATION, /* BLACK_URQUAN_SHIP */ \
YEHAT_REBEL_CONVERSATION, /* YEHAT_REBEL_SHIP */ \ YEHAT_REBEL_CONVERSATION, /* YEHAT_REBEL_SHIP */ \
URQUAN_PROBE_CONVERSATION, /* URQUAN_PROBE_SHIP */ URQUAN_DRONE_CONVERSATION, /* URQUAN_DRONE_SHIP */
#define RACE_SHIP_FOR_COMM \ #define RACE_SHIP_FOR_COMM \
ARILOU_SHIP, /* ARILOU_CONVERSATION */ \ ARILOU_SHIP, /* ARILOU_CONVERSATION */ \
@@ -449,7 +449,7 @@ enum
BLACK_URQUAN_SHIP, /* BLACKURQ_CONVERSATION */ \ BLACK_URQUAN_SHIP, /* BLACKURQ_CONVERSATION */ \
UMGAH_SHIP, /* TALKING_PET_CONVERSATION */ \ UMGAH_SHIP, /* TALKING_PET_CONVERSATION */ \
SLYLANDRO_SHIP, /* SLYLANDRO_HOME_CONVERSATION */ \ SLYLANDRO_SHIP, /* SLYLANDRO_HOME_CONVERSATION */ \
URQUAN_PROBE_SHIP, /* URQUAN_PROBE_CONVERSATION */ \ URQUAN_DRONE_SHIP, /* URQUAN_DRONE_CONVERSATION */ \
YEHAT_SHIP, /* YEHAT_REBEL_CONVERSATION */ \ YEHAT_SHIP, /* YEHAT_REBEL_CONVERSATION */ \
HUMAN_SHIP /* INVALID_CONVERSATION */ HUMAN_SHIP /* INVALID_CONVERSATION */
@@ -503,7 +503,7 @@ enum
LOG_TO_IP (36), /* SYREEN_SHIP */ \ LOG_TO_IP (36), /* SYREEN_SHIP */ \
LOG_TO_IP (30), /* BLACK_URQUAN_SHIP */ \ LOG_TO_IP (30), /* BLACK_URQUAN_SHIP */ \
LOG_TO_IP (30), /* YEHAT_REBEL_SHIP */ \ LOG_TO_IP (30), /* YEHAT_REBEL_SHIP */ \
LOG_TO_IP (90), /* URQUAN_PROBE_SHIP */ LOG_TO_IP (90), /* URQUAN_DRONE_SHIP */
#define LOG_TO_HYPER(s) (WORLD_TO_VELOCITY (s) >> 1) #define LOG_TO_HYPER(s) (WORLD_TO_VELOCITY (s) >> 1)
#define RACE_HYPER_SPEED \ #define RACE_HYPER_SPEED \
@@ -555,7 +555,7 @@ enum
0, /* SYREEN_SHIP */ \ 0, /* SYREEN_SHIP */ \
70, /* BLACK_URQUAN_SHIP */ \ 70, /* BLACK_URQUAN_SHIP */ \
60, /* YEHAT_REBEL_SHIP */ \ 60, /* YEHAT_REBEL_SHIP */ \
0, /* URQUAN_PROBE_SHIP */ 0, /* URQUAN_DRONE_SHIP */
#define RACE_INTERPLANETARY_PERCENT \ #define RACE_INTERPLANETARY_PERCENT \
0, /* ARILOU_SHIP */ \ 0, /* ARILOU_SHIP */ \
@@ -581,7 +581,7 @@ enum
0, /* SYREEN_SHIP */ \ 0, /* SYREEN_SHIP */ \
40, /* BLACK_URQUAN_SHIP */ \ 40, /* BLACK_URQUAN_SHIP */ \
40, /* YEHAT_REBEL_SHIP */ \ 40, /* YEHAT_REBEL_SHIP */ \
0, /* URQUAN_PROBE_SHIP */ 0, /* URQUAN_DRONE_SHIP */
// How many ships will an encounter consist of. // How many ships will an encounter consist of.
// The first number specifies the minimum, the second the maximum. // The first number specifies the minimum, the second the maximum.