equal
deleted
inserted
replaced
211 /* Layout number */ |
211 /* Layout number */ |
212 case 0x44: return industry->selected_layout; |
212 case 0x44: return industry->selected_layout; |
213 |
213 |
214 /* player info */ |
214 /* player info */ |
215 case 0x45: { |
215 case 0x45: { |
216 byte colour1, colour2; ///< Not initializing these two will give some kind of random |
216 byte colours; |
217 bool is_ai = false; |
217 bool is_ai = false; |
|
218 |
218 if (IsValidPlayer(industry->founder)) { |
219 if (IsValidPlayer(industry->founder)) { |
219 const Player *p = GetPlayer(industry->founder); |
220 const Player *p = GetPlayer(industry->founder); |
220 const Livery *l = &p->livery[LS_DEFAULT]; |
221 const Livery *l = &p->livery[LS_DEFAULT]; |
|
222 |
221 is_ai = p->is_ai; |
223 is_ai = p->is_ai; |
222 colour1 = l->colour1; |
224 colours = l->colour1 + l->colour2 * 16; |
223 colour2 = l->colour2; |
225 } else { |
|
226 colours = GB(Random(), 0, 8); |
224 } |
227 } |
225 return industry->founder | (is_ai ? 0x10000 : 0) | ((colour1 + colour2 * 16) << 24); |
228 |
|
229 return industry->founder | (is_ai ? 0x10000 : 0) | (colours << 24); |
226 } |
230 } |
227 |
231 |
228 /* Get industry ID at offset param */ |
232 /* Get industry ID at offset param */ |
229 case 0x60: return GetIndustryIDAtOffset(GetNearbyTile(parameter, industry->xy), industry); |
233 case 0x60: return GetIndustryIDAtOffset(GetNearbyTile(parameter, industry->xy), industry); |
230 |
234 |