From dea1144bcb52b6c5f2c985395b2775cedcbff5ce Mon Sep 17 00:00:00 2001 From: rubidium Date: Thu, 16 Jul 2009 20:15:28 +0000 Subject: (svn r16850) -Codechange: unify some naming of variables between waypoints and stations. --- src/saveload/afterload.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/saveload/afterload.cpp') diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp index 3d5af563c..9d1537a7d 100644 --- a/src/saveload/afterload.cpp +++ b/src/saveload/afterload.cpp @@ -447,8 +447,8 @@ bool AfterLoadGame() Waypoint *wp; FOR_ALL_WAYPOINTS(wp) { - wp->name = CopyFromOldName(wp->string); - wp->string = STR_EMPTY; + wp->name = CopyFromOldName(wp->string_id); + wp->string_id = STR_NULL; } } @@ -1005,7 +1005,7 @@ bool AfterLoadGame() Waypoint *wp; FOR_ALL_WAYPOINTS(wp) { - if (wp->deleted == 0) { + if (wp->delete_ctr == 0) { const StationSpec *statspec = NULL; if (HasBit(_m[wp->xy].m3, 4)) -- cgit v1.2.3-54-g00ecf