mirror/OpenTTD
1
0
Fork 1
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-08-16 19:19:09 +00:00
Code Issues Activity

(svn r2046) -Codechange: moved all waypoint code to waypoint.c/waypoint.h

Browse Source 
-Codechange: rewrote some functions while moving waypoint-stuff
-Add: added support for 64k waypoints
-Fix: made the waypoint struct a bit more logic (no bit-fucking)
This commit is contained in:
truelight
2005-03-24 17:03:37 +00:00
parent f86318407c
commit 83637d164e
20 changed files with 617 additions and 442 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
strings.c
View File

@@ -9,6 +9,7 @@
#include "vehicle.h"
#include "news.h"
#include "screenshot.h"
#include "waypoint.h"
static char *StationGetSpecialString(char *buff);
static char *GetSpecialTownNameString(char *buff, int ind);
@@ -545,14 +546,14 @@ static char *DecodeString(char *buff, const char *str)
}
case 0x9D: { // {WAYPOINT}
Waypoint *cp = &_waypoints[GetDParam(0)];
Waypoint *wp = GetWaypoint(GetDParam(0));
StringID str;
int idx;
if (~cp->town_or_string & 0xC000) {
if (wp->string != STR_NULL) {
GetParamInt32(); // skip it
str = cp->town_or_string;
str = wp->string;
} else {
idx = (cp->town_or_string >> 8) & 0x3F;
idx = wp->town_cn;
if (idx == 0) {
str = STR_WAYPOINTNAME_CITY;
} else {
@@ -560,7 +561,7 @@ static char *DecodeString(char *buff, const char *str)
SetDParam(1, idx + 1);
str = STR_WAYPOINTNAME_CITY_SERIAL;
}
SetDParam(0, cp->town_or_string & 0xFF);
SetDParam(0, wp->town_index);
}
buff = GetString(buff, str);