cpp/openttd-patchpack/source Changeset - r8955:31c083f63196

Changeset - r8955:31c083f63196

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

peter1138 - 16 years ago 2008-04-17 06:52:56
peter1138@openttd.org

(svn r12746) -Codechange: Add map storage for station animation frame

3 files changed with 14 insertions and 1 deletions:

docs/landscape.html

docs/landscape_grid.html

src/station_map.h

0 comments (0 inline, 0 general)

docs/landscape.html

➞

Show inline comments

@@ @@ -806,192 +806,193 @@ @@
        <tr>
         <td nowrap valign=top><tt>00</tt>..<tt>07</tt>&nbsp; </td>
         <td align=left>railway station
          <table>
           <tr>
            <td><tt>00</tt>..<tt>01</tt>&nbsp; </td>
            <td align=left>open platform</td>
           </tr>
           <tr>
            <td><tt>02</tt>..<tt>03</tt>&nbsp; </td>
            <td align=left>open platform with station building</td>
           </tr>
           <tr>
            <td><tt>04</tt>....<tt>07</tt>&nbsp; </td>
            <td align=left>roofed platform</td>
           </tr>
           <tr>
            <td colspan=2>bit 0: clear = in X direction, set = in Y direction</td>
           </tr>
          </table>
         </td>
        </tr>
        <tr>
         <td nowrap valign=top><tt>00</tt>..<tt>8F</tt></td>
         <td align=left>all airports</td>
        </tr>
        <tr>
         <td nowrap valign=top><tt>00</tt>..<tt>05</tt>&nbsp; </td>
         <td align=left>road stops:
          <table>
           <tr>
            <td><tt>00</tt>&nbsp; </td>
            <td align=left>exit towards NE</td>
           </tr>
           <tr>
            <td><tt>01</tt>&nbsp; </td>
            <td align=left>exit towards SE</td>
           </tr>
           <tr>
            <td><tt>02</tt>&nbsp; </td>
            <td align=left>exit towards SW</td>
           </tr>
           <tr>
            <td><tt>03</tt>&nbsp; </td>
            <td align=left>exit towards NW</td>
           </tr>
           <tr>
            <td><tt>04</tt>&nbsp; </td>
            <td align=left>drive through X</td>
           </tr>
           <tr>
            <td><tt>05</tt>&nbsp; </td>
            <td align=left>drive through Y</td>
           </tr>
          </table>
         </td>
        </tr>
        <tr>
         <td nowrap valign=top><tt>00</tt>..<tt>05</tt>&nbsp; </td>
         <td align=left>ship dock
          <table>
           <tr>
            <td><tt>00</tt>&nbsp; </td>
            <td align=left>SW coast part</td>
           </tr>
           <tr>
            <td><tt>01</tt>&nbsp; </td>
            <td align=left>NW coast part</td>
           </tr>
           <tr>
            <td><tt>02</tt>&nbsp; </td>
            <td align=left>NE coast part</td>
           </tr>
           <tr>
            <td><tt>03</tt>&nbsp; </td>
            <td align=left>SE coast part</td>
           </tr>
           <tr>
            <td><tt>04</tt>&nbsp; </td>
            <td align=left>X direction water part</td>
           </tr>
           <tr>
            <td><tt>05</tt>&nbsp; </td>
            <td align=left>Y direction water part</td>
           </tr>
          </table>
         </td>
        </tr>
       </table>
      </li>
      <li>m6 bits 5..3: the station type (rail, airport, truck, bus, oilrig, dock, buoy)</li>
      <li>m6 bit 2: 1 when a drive through road stop is built over a town owned road, otherwise 0</li>
      <li>m6 bits 1..0 : <a href="#tropic_zone">Tropic zone definition</a></li>
      <li>m7: animation frame</li>
     </ul>
    </td>
   </tr>
   <tr bgcolor="#CCCCCC">
    <td valign=top nowrap><strong><a name="Class6"><tt> 6 </tt></a></strong></td>
    <td><strong>Water</strong></td>
   </tr>
   <tr>
    <td valign=top nowrap>&nbsp;</td>
    <td>
     <ul>
      <li>m1: <a href="#OwnershipInfo">owner</a> (for sea, rivers, and coasts normally <tt>11</tt>)</li>
      <li>m3 bits 1..0 : Water class (sea, canal or river)
      <li>m4: Random data for canal or river tiles</li>
      <li>m5: tile type:
       <table>
        <tr>
         <td nowrap valign=top><tt>00</tt>&nbsp; </td>
         <td align=left>water, canal or river</td>
        </tr>
        <tr>
         <td nowrap valign=top><tt>01</tt>&nbsp; </td>
         <td align=left>coast or riverbank</td>
        </tr>
        <tr>
         <td nowrap valign=top><tt>10</tt>..<tt>1B</tt>&nbsp; </td>
         <td align=left>canal locks
          <table>
           <tr>
            <td nowrap valign=top><tt>10</tt>&nbsp; </td>
            <td align=left>middle part, (SW-NE direction)</td>
           </tr>
           <tr>
            <td nowrap valign=top><tt>11</tt>&nbsp; </td>
            <td align=left>middle part, (NW-SE direction)</td>
           </tr>
           <tr>
            <td nowrap valign=top><tt>12</tt>&nbsp; </td>
            <td align=left>middle part, (NE-SW direction)</td>
           </tr>
           <tr>
            <td nowrap valign=top><tt>13</tt>&nbsp; </td>
            <td align=left>middle part, (SE-NW direction)</td>
           </tr>
           <tr>
            <td nowrap valign=top><tt>14</tt>&nbsp; </td>
            <td align=left>lower part, (SW-NE direction)</td>
           </tr>
           <tr>
            <td nowrap valign=top><tt>15</tt>&nbsp; </td>
            <td align=left>lower part, (NW-SE direction)</td>
           </tr>
           <tr>
            <td nowrap valign=top><tt>16</tt>&nbsp; </td>
            <td align=left>lower part, (NE-SW direction)</td>
           </tr>
           <tr>
            <td nowrap valign=top><tt>17</tt>&nbsp; </td>
            <td align=left>lower part, (SE-NW direction)</td>
           </tr>
           <tr>
            <td nowrap valign=top><tt>18</tt>&nbsp; </td>
            <td align=left>upper part, (SW-NE direction)</td>
           </tr>
           <tr>
            <td nowrap valign=top><tt>19</tt>&nbsp; </td>
            <td align=left>upper part, (NW-SE direction)</td>
           </tr>
           <tr>
            <td nowrap valign=top><tt>1A</tt>&nbsp; </td>
            <td align=left>upper part, (NE-SW direction)</td>
           </tr>
           <tr>
            <td nowrap valign=top><tt>1B</tt>&nbsp; </td>
            <td align=left>upper part, (SE-NW direction)</td>
           </tr>
          </table>
         </td>
        </tr>
        <tr>
         <td nowrap valign=top><tt>80</tt>..<tt>83</tt>&nbsp; </td>
         <td align=left>ship depots
          <table>
           <tr>
            <td nowrap valign=top><tt>80</tt>&nbsp; </td>
            <td align=left>ship depot, NE part (X direction)</td>
           </tr>
           <tr>
            <td nowrap valign=top><tt>81</tt>&nbsp; </td>
            <td align=left>ship depot, SW part (X direction)</td>
           </tr>
           <tr>

docs/landscape_grid.html

➞

Show inline comments

@@ @@ -105,193 +105,193 @@ the array so you can quickly see what is @@
       <td class="bits">XXXX <span class="option">~~</span>XX</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits">-inherit-</td>
       <td class="bits">XX<span class="free">OO OO</span>XX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
     </tr>
     <tr>
       <td class="caption">depot</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
       <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
       <td class="bits"><span class="free">OOOO</span> <span class="option">~~</span>XX</td>
       <td class="bits"><span class="free">OOOO</span> XXXX</td>
       <td class="bits">XX<span class="free">OO OO</span>XX</td>
       <td class="bits">XX<span class="free">OO OO</span>XX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
     </tr>
     <tr>
       <td class="caption">waypoint</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
       <td class="bits">XXXX XXXX XXXX XXXX</td>
       <td class="bits"><span class="free">OOOO</span> <span class="option">~~</span>XX</td>
       <td class="bits"><span class="free">OOOO</span> XXXX</td>
       <td class="bits">XX<span class="free">OO OOO</span>X</td>
       <td class="bits">XX<span class="free">OO OO</span>XX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
     </tr>
     <tr>
       <td rowspan=3>2</td>
       <td class="caption">road</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits"><span class="option">~~~</span>X XXXX</td>
       <td class="bits">XXXX XXXX XXXX XXXX</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits">XXXX XXXX</td>
     </tr>
     <tr>
       <td class="caption">level crossing</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
       <td class="bits">XXXX <span class="option">~~</span>XX</td>
       <td class="bits"><span class="free">O</span>XXX XXXX</td>
       <td class="bits">XX<span class="free">OO</span> XXXX</td>
       <td class="bits">XX<span class="free">OO OO</span>XX</td>
       <td class="bits">-inherit-</td>
     </tr>
     <tr>
       <td class="caption">road depot</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
       <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
       <td class="bits">X<span class="free">OOO OOOO</span></td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits">XX<span class="free">OO OO</span>XX</td>
       <td class="bits">XX<span class="free">OO OO</span>XX</td>
       <td class="bits">XXX<span class="free">O OOOO</span></td>
     </tr>
     <tr>
       <td>3</td>
       <td class="caption">house</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits">XXXX XXXX XXXX XXXX</td>
       <td class="bits">XXX<span class="option">~ ~~</span>XX</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits">XXX<span class="abuse">X XXXX</span></td>
       <td class="bits"><span class="abuse">XXXX XX</span>XX</td>
       <td class="bits">XXXX <span class="abuse">XXXX</span></td>
     </tr>
     <tr>
       <td>4</td>
       <td class="caption">trees</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits"><span class="option">~~~~ ~~~~</span></td>
       <td class="bits"><span class="free">OOOO OOOO</span> XXXX XXXX</td>
       <td class="bits"><span class="option">~~</span>XX XXXX</td>
       <td class="bits">XXXX XX<span class="free">OO</span></td>
       <td class="bits">XX<span class="free">OO O</span>XXX</td>
       <td class="bits"><span class="free">OOOO OO</span>XX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
     </tr>
     <tr>
       <td rowspan=6>5</td>
       <td class="caption">rail station</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits"><span class="option">~~~</span>X XXXX</td>
       <td class="bits">XXXX XXXX XXXX XXXX</td>
       <td class="bits">XXXX <span class="option">~~</span>XX</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits"><span class="free">OO</span>XX X<span class="free">O</span>XX</td>
-      <td class="bits"><span class="free">OOOO OOOO</span></td>
+      <td class="bits">XXXX XXXX</td>
     </tr>
     <tr>
       <td class="caption">road stop</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
       <td class="bits"><span class="free">OOOO O</span>XXX</td>
       <td class="bits"><span class="option">~~~~ ~~~~</span></td>
       <td class="bits"><span class="option">~~~~ ~</span>XXX</td>
       <td class="bits"><span class="free">OO</span>XX XXXX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
     </tr>
     <tr>
       <td class="caption">dock</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
       <td class="bits"><span class="free">OOOO OO</span>XX</td>
       <td class="bits"><span class="option">~~~~ ~~~~</span></td>
       <td class="bits"><span class="option">~~~~ ~</span>XXX</td>
       <td class="bits"><span class="free">OO</span>XX X<span class="free">O</span>XX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
     </tr>
     <tr>
       <td class="caption">airport</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits"><span class="option">~~~~ ~~~~</span></td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits"><span class="free">OO</span>XX X<span class="free">O</span>XX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
     </tr>
     <tr>
       <td class="caption">buoy</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
       <td class="bits"><span class="free">OOOO OO</span>XX</td>
       <td class="bits"><span class="option">~~~~ ~~~~</span></td>
       <td class="bits"><span class="option">~~~~ ~~~~</span></td>
       <td class="bits"><span class="free">OO</span>XX X<span class="free">O</span>XX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
     </tr>
     <tr>
       <td class="caption">oilrig</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits"><span class="option">~~~~ ~~~~</span></td>
       <td class="bits"><span class="option">~~~~ ~~~~</span></td>
       <td class="bits"><span class="free">OO</span>XX X<span class="free">O</span>XX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
     </tr>
     <tr>
       <td rowspan=3>6</td>
       <td class="caption">sea, shore</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits"><span class="option">~~~</span>X XXXX</td>
       <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
       <td class="bits"><span class="free">OOOO OO</span>XX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits">X<span class="option">~~</span>X XXXX</td>
       <td class="bits">XX<span class="free">OO OO</span>XX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
     </tr>
     <tr>
       <td class="caption">canal, river</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
       <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
       <td class="bits"><span class="free">OOOO OO</span>XX</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits">-inherit-</td>
       <td class="bits">XX<span class="free">OO OO</span>XX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
     </tr>
     <tr>
       <td class="caption">shipdepot</td>
       <td class="bits">-inherit-</td>
       <td class="bits">-inherit-</td>
       <td class="bits"><span class="free">OOOO OOOO OOOO OOOO</span></td>
       <td class="bits"><span class="free">OOOO OO</span>XX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
       <td class="bits">-inherit-</td>
       <td class="bits">XX<span class="free">OO OO</span>XX</td>
       <td class="bits"><span class="free">OOOO OOOO</span></td>
     </tr>
     <tr>
       <td>8</td>
       <td class="caption">industry</td>
       <td class="bits">XXXX XXXX</td>
       <td class="bits">X<span class="free">OOO</span> <span class="abuse">
         XXXX</span></td>

src/station_map.h

➞

Show inline comments

 /* $Id$ */
 /** @file station_map.h */
 #ifndef STATION_MAP_H
 #define STATION_MAP_H
 #include "rail_map.h"
 #include "road_map.h"
 #include "water_map.h"
 #include "station_func.h"
 #include "station_base.h"
 #include "rail.h"
 typedef byte StationGfx;
 static inline StationID GetStationIndex(TileIndex t)
+{
 	assert(IsTileType(t, MP_STATION));
 	return (StationID)_m[t].m2;
+}
 static inline Station *GetStationByTile(TileIndex t)
+{
 	return GetStation(GetStationIndex(t));
+}
 enum {
 	GFX_RADAR_LARGE_FIRST             =  31,
 	GFX_RADAR_LARGE_LAST              =  42,
 	GFX_WINDSACK_FIRST                =  50,
 	GFX_WINDSACK_LAST                 =  53,
 	GFX_DOCK_BASE_WATER_PART          =  4,
 	GFX_TRUCK_BUS_DRIVETHROUGH_OFFSET =  4,
 	GFX_RADAR_INTERNATIONAL_FIRST     =  66,
 	GFX_RADAR_INTERNATIONAL_LAST      =  77,
 	GFX_RADAR_METROPOLITAN_FIRST      =  78,
 	GFX_RADAR_METROPOLITAN_LAST       =  89,
 	GFX_RADAR_DISTRICTWE_FIRST        = 121,
 	GFX_RADAR_DISTRICTWE_LAST         = 132,
 	GFX_WINDSACK_INTERCON_FIRST       = 140,
 	GFX_WINDSACK_INTERCON_LAST        = 143,
 };
 static inline StationType GetStationType(TileIndex t)
+{
 	return (StationType)GB(_m[t].m6, 3, 3);
+}
 static inline RoadStopType GetRoadStopType(TileIndex t)
+{
 	assert(GetStationType(t) == STATION_TRUCK || GetStationType(t) == STATION_BUS);
 	return GetStationType(t) == STATION_TRUCK ? ROADSTOP_TRUCK : ROADSTOP_BUS;
+}
 static inline StationGfx GetStationGfx(TileIndex t)
+{
 	assert(IsTileType(t, MP_STATION));
 	return _m[t].m5;
+}
 static inline void SetStationGfx(TileIndex t, StationGfx gfx)
+{
 	assert(IsTileType(t, MP_STATION));
 	_m[t].m5 = gfx;
+}
 static inline uint8 GetStationAnimationFrame(TileIndex t)
+{
 	assert(IsTileType(t, MP_STATION));
 	return _me[t].m7;
+}
 static inline void SetStationAnimationFrame(TileIndex t, uint8 frame)
+{
 	assert(IsTileType(t, MP_STATION));
 	_me[t].m7 = frame;
+}
 static inline bool IsRailwayStation(TileIndex t)
+{
 	return GetStationType(t) == STATION_RAIL;
+}
 static inline bool IsRailwayStationTile(TileIndex t)
+{
 	return IsTileType(t, MP_STATION) && IsRailwayStation(t);
+}
 static inline bool IsAirport(TileIndex t)
+{
 	return GetStationType(t) == STATION_AIRPORT;
+}
 bool IsHangar(TileIndex t);
 static inline bool IsTruckStop(TileIndex t)
+{
 	return GetStationType(t) == STATION_TRUCK;
+}
 static inline bool IsBusStop(TileIndex t)
+{
 	return GetStationType(t) == STATION_BUS;
+}
 static inline bool IsRoadStop(TileIndex t)
+{
 	assert(IsTileType(t, MP_STATION));
 	return IsTruckStop(t) || IsBusStop(t);
+}
 static inline bool IsRoadStopTile(TileIndex t)
+{
 	return IsTileType(t, MP_STATION) && IsRoadStop(t);
+}
 static inline bool IsStandardRoadStopTile(TileIndex t)
+{
 	return IsRoadStopTile(t) && GetStationGfx(t) < GFX_TRUCK_BUS_DRIVETHROUGH_OFFSET;
+}
 static inline bool IsDriveThroughStopTile(TileIndex t)
+{
 	return IsRoadStopTile(t) && GetStationGfx(t) >= GFX_TRUCK_BUS_DRIVETHROUGH_OFFSET;
+}
 static inline bool GetStopBuiltOnTownRoad(TileIndex t)
+{
 	assert(IsDriveThroughStopTile(t));
 	return HasBit(_m[t].m6, 2);
+}
 /**
  * Gets the direction the road stop entrance points towards.
  */
 static inline DiagDirection GetRoadStopDir(TileIndex t)
+{
 	StationGfx gfx = GetStationGfx(t);
 	assert(IsRoadStopTile(t));
 	if (gfx < GFX_TRUCK_BUS_DRIVETHROUGH_OFFSET) {
 		return (DiagDirection)(gfx);
 	} else {
 		return (DiagDirection)(gfx - GFX_TRUCK_BUS_DRIVETHROUGH_OFFSET);
+	}
+}
 static inline bool IsOilRig(TileIndex t)
+{
 	return GetStationType(t) == STATION_OILRIG;
+}
 static inline bool IsDock(TileIndex t)
+{
 	return GetStationType(t) == STATION_DOCK;
+}
 static inline bool IsBuoy(TileIndex t)
+{
 	return GetStationType(t) == STATION_BUOY;
+}
 static inline bool IsBuoyTile(TileIndex t)
+{
 	return IsTileType(t, MP_STATION) && IsBuoy(t);
+}
 static inline bool IsHangarTile(TileIndex t)
+{
 	return IsTileType(t, MP_STATION) && IsHangar(t);
+}
 static inline Axis GetRailStationAxis(TileIndex t)

0 comments (0 inline, 0 general)