Skip to content

Commit

Permalink
update to r7040
Browse files Browse the repository at this point in the history
  • Loading branch information
@Dwachs
Dwachs committed Jan 26, 2014
1 parent 9a2dfe6 commit b2901fd
Show file tree
Hide file tree
Showing 28 changed files with 479 additions and 95 deletions.
1 change: 1 addition & 0 deletions annotated.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@
<tr><td class="indexkey"><a class="el" href="classsquare__x.html">square_x</a></td><td class="indexvalue"></td></tr>
<tr><td class="indexkey"><a class="el" href="classtile__object__list__x.html">tile_object_list_x</a></td><td class="indexvalue"></td></tr>
<tr><td class="indexkey"><a class="el" href="classtile__x.html">tile_x</a></td><td class="indexvalue"></td></tr>
<tr><td class="indexkey"><a class="el" href="classtime__ticks__x.html">time_ticks_x</a></td><td class="indexvalue"></td></tr>
<tr><td class="indexkey"><a class="el" href="classtime__x.html">time_x</a></td><td class="indexvalue"></td></tr>
<tr><td class="indexkey"><a class="el" href="classtree__desc__x.html">tree_desc_x</a></td><td class="indexvalue"></td></tr>
<tr><td class="indexkey"><a class="el" href="classtree__x.html">tree_x</a></td><td class="indexvalue"></td></tr>
Expand Down
1 change: 1 addition & 0 deletions api__simple_8cc.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@
<tr><td colspan="2"><h2><a name="nested-classes"></a>
Classes</h2></td></tr>
<tr><td class="memItemLeft" align="right" valign="top">class &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classtime__x.html">time_x</a></td></tr>
<tr><td class="memItemLeft" align="right" valign="top">class &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classtime__ticks__x.html">time_ticks_x</a></td></tr>
<tr><td class="memItemLeft" align="right" valign="top">class &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classdir.html">dir</a></td></tr>
</table>
<hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
Expand Down
26 changes: 16 additions & 10 deletions api__simple_8cc_source.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,17 +86,23 @@
<a name="l00012"></a><a class="code" href="classtime__x.html#aca1536a498b55607497ce661d6eaab5c">00012</a> integer <a class="code" href="classtime__x.html#aca1536a498b55607497ce661d6eaab5c" title="year">year</a>;
<a name="l00013"></a><a class="code" href="classtime__x.html#a508e6515130f2b1b4039f789d2180a8f">00013</a> integer <a class="code" href="classtime__x.html#a508e6515130f2b1b4039f789d2180a8f" title="month in 0..11">month</a>;
<a name="l00014"></a>00014 };
<a name="l00019"></a><a class="code" href="classdir.html">00019</a> <span class="keyword">class </span><a class="code" href="classdir.html">dir</a> {
<a name="l00019"></a><a class="code" href="classtime__ticks__x.html">00019</a> <span class="keyword">class </span><a class="code" href="classtime__ticks__x.html">time_ticks_x</a> : <span class="keyword">public</span> <a class="code" href="classtime__x.html">time_x</a> {
<a name="l00020"></a>00020 <span class="keyword">public</span>:
<a name="l00025"></a>00025 <span class="keyword">static</span> <span class="keywordtype">bool</span> <a class="code" href="classdir.html#abdd5a6e881b3fe2fad153f06430573b7">is_single</a>(<a class="code" href="classdir.html">dir</a> d);
<a name="l00030"></a>00030 <span class="keyword">static</span> <span class="keywordtype">bool</span> <a class="code" href="classdir.html#a4ec446fcb6ff3c66821b8a4dbc1976fe">is_twoway</a>(<a class="code" href="classdir.html">dir</a> d);
<a name="l00035"></a>00035 <span class="keyword">static</span> <span class="keywordtype">bool</span> <a class="code" href="classdir.html#a6fd8624a5d28891b92eff2bdd504e6a5">is_threeway</a>(<a class="code" href="classdir.html">dir</a> d);
<a name="l00040"></a>00040 <span class="keyword">static</span> <span class="keywordtype">bool</span> <a class="code" href="classdir.html#a5c123ab819f6063da8a56d480b11df01">is_curve</a>(<a class="code" href="classdir.html">dir</a> d);
<a name="l00045"></a>00045 <span class="keyword">static</span> <span class="keywordtype">bool</span> <a class="code" href="classdir.html#a12989961a428bc37e964a779420316f1">is_straight</a>(<a class="code" href="classdir.html">dir</a> d);
<a name="l00050"></a>00050 <span class="keyword">static</span> <a class="code" href="classdir.html">dir</a> <a class="code" href="classdir.html#a3e1d664db7453876eff14b78d4ecd551">double</a>(<a class="code" href="classdir.html">dir</a> d);
<a name="l00055"></a>00055 <span class="keyword">static</span> <a class="code" href="classdir.html">dir</a> <a class="code" href="classdir.html#afb73e882097e002321849eb8c49e9f53">backward</a>(<a class="code" href="classdir.html">dir</a> d);
<a name="l00056"></a>00056 };
<a name="l00057"></a>00057
<a name="l00021"></a><a class="code" href="classtime__ticks__x.html#a614a235a388be3a372f5571d04f3bcaf">00021</a> integer <a class="code" href="classtime__ticks__x.html#a614a235a388be3a372f5571d04f3bcaf" title="current time in ticks">ticks</a>;
<a name="l00022"></a><a class="code" href="classtime__ticks__x.html#a8a2e305561775c0490a55c3d81d8f377">00022</a> integer <a class="code" href="classtime__ticks__x.html#a8a2e305561775c0490a55c3d81d8f377" title="length of one in-game month in ticks">ticks_per_month</a>;
<a name="l00023"></a><a class="code" href="classtime__ticks__x.html#aad7450c59a10b0ab506bd76b8f33bac4">00023</a> integer <a class="code" href="classtime__ticks__x.html#aad7450c59a10b0ab506bd76b8f33bac4" title="new month will start at this time">next_month_ticks</a>;
<a name="l00024"></a>00024 };
<a name="l00029"></a><a class="code" href="classdir.html">00029</a> <span class="keyword">class </span><a class="code" href="classdir.html">dir</a> {
<a name="l00030"></a>00030 <span class="keyword">public</span>:
<a name="l00035"></a>00035 <span class="keyword">static</span> <span class="keywordtype">bool</span> <a class="code" href="classdir.html#abdd5a6e881b3fe2fad153f06430573b7">is_single</a>(<a class="code" href="classdir.html">dir</a> d);
<a name="l00040"></a>00040 <span class="keyword">static</span> <span class="keywordtype">bool</span> <a class="code" href="classdir.html#a4ec446fcb6ff3c66821b8a4dbc1976fe">is_twoway</a>(<a class="code" href="classdir.html">dir</a> d);
<a name="l00045"></a>00045 <span class="keyword">static</span> <span class="keywordtype">bool</span> <a class="code" href="classdir.html#a6fd8624a5d28891b92eff2bdd504e6a5">is_threeway</a>(<a class="code" href="classdir.html">dir</a> d);
<a name="l00050"></a>00050 <span class="keyword">static</span> <span class="keywordtype">bool</span> <a class="code" href="classdir.html#a5c123ab819f6063da8a56d480b11df01">is_curve</a>(<a class="code" href="classdir.html">dir</a> d);
<a name="l00055"></a>00055 <span class="keyword">static</span> <span class="keywordtype">bool</span> <a class="code" href="classdir.html#a12989961a428bc37e964a779420316f1">is_straight</a>(<a class="code" href="classdir.html">dir</a> d);
<a name="l00060"></a>00060 <span class="keyword">static</span> <a class="code" href="classdir.html">dir</a> <a class="code" href="classdir.html#a3e1d664db7453876eff14b78d4ecd551">double</a>(<a class="code" href="classdir.html">dir</a> d);
<a name="l00065"></a>00065 <span class="keyword">static</span> <a class="code" href="classdir.html">dir</a> <a class="code" href="classdir.html#afb73e882097e002321849eb8c49e9f53">backward</a>(<a class="code" href="classdir.html">dir</a> d);
<a name="l00066"></a>00066 };
<a name="l00067"></a>00067
</pre></div></div>
</div>
<!-- window showing the filter options -->
Expand Down
2 changes: 1 addition & 1 deletion api__world_8cc_source.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
<a name="l00018"></a>00018 <span class="keyword">static</span> <a class="code" href="classcity__x.html">city_x</a> <a class="code" href="classworld.html#a75d44c3167cdb5cf3460dd43e10aa614">find_nearest_city</a>(<a class="code" href="classcoord.html">coord</a> k);
<a name="l00023"></a>00023 <span class="keyword">static</span> integer <a class="code" href="classworld.html#a9e3e9e942876c69099fee2990cfbb2ef">get_season</a>();
<a name="l00035"></a>00035 <span class="keyword">static</span> <span class="keywordtype">bool</span> <a class="code" href="classworld.html#ac25b7a3d48f7bddc6a57012b496dde02">remove_player</a>(<a class="code" href="classplayer__x.html">player_x</a> pl);
<a name="l00039"></a>00039 <span class="keyword">static</span> <a class="code" href="classtime__x.html">time_x</a> <a class="code" href="classworld.html#aefd105ebbfe2920e89002f2fd5d5ee9f">get_time</a>();
<a name="l00039"></a>00039 <span class="keyword">static</span> <a class="code" href="classtime__ticks__x.html">time_ticks_x</a> <a class="code" href="classworld.html#a36b9c287660443552fc7438df7d36b11">get_time</a>();
<a name="l00044"></a>00044 <span class="keyword">static</span> array&lt;integer&gt; <a class="code" href="classworld.html#af75487208a0194ad78472e8214ab4013">get_citizens</a>();
<a name="l00049"></a>00049 <span class="keyword">static</span> array&lt;integer&gt; <a class="code" href="classworld.html#a058e5542755cf68864ecf5566c4b6ebf">get_growth</a>();
<a name="l00054"></a>00054 <span class="keyword">static</span> array&lt;integer&gt; <a class="code" href="classworld.html#a446a28949755b8d2ea51b87f69d98500">get_towns</a>();
Expand Down
1 change: 1 addition & 0 deletions changelog.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
<div class="textblock"><h2><a class="anchor" id="api-trunk"></a>
Current trunk</h2>
<ul>
<li>Changed return type of <a class="el" href="classworld.html#a36b9c287660443552fc7438df7d36b11">world::get_time</a> to <a class="el" href="classtime__ticks__x.html">time_ticks_x</a></li>
<li>Added <a class="el" href="classbuilding__x.html#aa0c646087c67cb35d25bc238e86e81f0">building_x::is_same_building</a>.</li>
<li>Added <a class="el" href="classattraction__list__x.html">attraction_list_x</a>, <a class="el" href="classworld.html#afbfcfcee1327466cb36a8b265741e4cb">world::get_attraction_list</a></li>
<li>Added <a class="el" href="api__skeleton_8cc.html#ac954558374aa1d041896a8d6ad7fb617">new_month</a>, <a class="el" href="api__skeleton_8cc.html#ae84442cfdd65196b1ddafe3125638913">new_year</a></li>
Expand Down
2 changes: 1 addition & 1 deletion classdir.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
<hr/><a name="details" id="details"></a><h2>Detailed Description</h2>
<div class="textblock"><p>Class holding static methods to work with directions. Directions are just bit-encoded integers. </p>

<p>Definition at line <a class="el" href="api__simple_8cc_source.html#l00019">19</a> of file <a class="el" href="api__simple_8cc_source.html">api_simple.cc</a>.</p>
<p>Definition at line <a class="el" href="api__simple_8cc_source.html#l00029">29</a> of file <a class="el" href="api__simple_8cc_source.html">api_simple.cc</a>.</p>
</div><hr/><h2>Member Function Documentation</h2>
<a class="anchor" id="afb73e882097e002321849eb8c49e9f53"></a><!-- doxytag: member="dir::backward" ref="afb73e882097e002321849eb8c49e9f53" args="(dir d)" -->
<div class="memitem">
Expand Down
22 changes: 11 additions & 11 deletions classes.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,27 +88,27 @@
</td><td valign="top"><a class="el" href="classcoord3d.html">coord3d</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="classgood__desc__x.html">good_desc_x</a>&#160;&#160;&#160;</td><td rowspan="2" valign="bottom"><a name="letter_P"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;P&#160;&#160;</div></td></tr></table>
</td><td valign="top"><a class="el" href="classtile__x.html">tile_x</a>&#160;&#160;&#160;</td></tr>
<tr><td rowspan="2" valign="bottom"><a name="letter_D"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;D&#160;&#160;</div></td></tr></table>
</td><td valign="top"><a class="el" href="classgui.html">gui</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="classtime__x.html">time_x</a>&#160;&#160;&#160;</td></tr>
</td><td valign="top"><a class="el" href="classgui.html">gui</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="classtime__ticks__x.html">time_ticks_x</a>&#160;&#160;&#160;</td></tr>
<tr><td valign="top"><a class="el" href="classattraction__list__x.html">attraction_list_x</a>&#160;&#160;&#160;</td><td rowspan="2" valign="bottom"><a name="letter_H"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;H&#160;&#160;</div></td></tr></table>
</td><td valign="top"><a class="el" href="classplayer__x.html">player_x</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="classtree__desc__x.html">tree_desc_x</a>&#160;&#160;&#160;</td></tr>
</td><td valign="top"><a class="el" href="classplayer__x.html">player_x</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="classtime__x.html">time_x</a>&#160;&#160;&#160;</td></tr>
<tr><td rowspan="2" valign="bottom"><a name="letter_B"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;B&#160;&#160;</div></td></tr></table>
</td><td valign="top"><a class="el" href="classdir.html">dir</a>&#160;&#160;&#160;</td><td rowspan="2" valign="bottom"><a name="letter_R"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;R&#160;&#160;</div></td></tr></table>
</td><td valign="top"><a class="el" href="classtree__x.html">tree_x</a>&#160;&#160;&#160;</td></tr>
</td><td valign="top"><a class="el" href="classtree__desc__x.html">tree_desc_x</a>&#160;&#160;&#160;</td></tr>
<tr><td rowspan="2" valign="bottom"><a name="letter_E"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;E&#160;&#160;</div></td></tr></table>
</td><td valign="top"><a class="el" href="classhalt__list__x.html">halt_list_x</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="classttext.html">ttext</a>&#160;&#160;&#160;</td></tr>
<tr><td valign="top"><a class="el" href="classbuilding__desc__x.html">building_desc_x</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="classhalt__x.html">halt_x</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="classrules.html">rules</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="classttextfile.html">ttextfile</a>&#160;&#160;&#160;</td></tr>
</td><td valign="top"><a class="el" href="classhalt__list__x.html">halt_list_x</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="classtree__x.html">tree_x</a>&#160;&#160;&#160;</td></tr>
<tr><td valign="top"><a class="el" href="classbuilding__desc__x.html">building_desc_x</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="classhalt__x.html">halt_x</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="classrules.html">rules</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="classttext.html">ttext</a>&#160;&#160;&#160;</td></tr>
<tr><td valign="top"><a class="el" href="classbuilding__x.html">building_x</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="classextend__get.html">extend_get</a>&#160;&#160;&#160;</td><td rowspan="2" valign="bottom"><a name="letter_M"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;M&#160;&#160;</div></td></tr></table>
</td><td rowspan="2" valign="bottom"><a name="letter_S"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;S&#160;&#160;</div></td></tr></table>
</td><td rowspan="2" valign="bottom"><a name="letter_W"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;W&#160;&#160;</div></td></tr></table>
</td></tr>
</td><td valign="top"><a class="el" href="classttextfile.html">ttextfile</a>&#160;&#160;&#160;</td></tr>
<tr><td rowspan="2" valign="bottom"><a name="letter_C"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;C&#160;&#160;</div></td></tr></table>
</td><td rowspan="2" valign="bottom"><a name="letter_F"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;F&#160;&#160;</div></td></tr></table>
</td><td rowspan="2" valign="bottom"><a name="letter_W"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;W&#160;&#160;</div></td></tr></table>
</td></tr>
<tr><td valign="top"><a class="el" href="classmap__object__x.html">map_object_x</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="classschedule__entry__x.html">schedule_entry_x</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="classway__desc__x.html">way_desc_x</a>&#160;&#160;&#160;</td></tr>
<tr><td valign="top"><a class="el" href="classmap__object__x.html">map_object_x</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="classschedule__entry__x.html">schedule_entry_x</a>&#160;&#160;&#160;</td></tr>
<tr><td valign="top"><a class="el" href="classcity__list__x.html">city_list_x</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="classfactory__list__x.html">factory_list_x</a>&#160;&#160;&#160;</td><td rowspan="2" valign="bottom"><a name="letter_O"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;O&#160;&#160;</div></td></tr></table>
</td><td valign="top"><a class="el" href="classschedule__x.html">schedule_x</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="classway__x.html">way_x</a>&#160;&#160;&#160;</td></tr>
<tr><td valign="top"><a class="el" href="classcity__x.html">city_x</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="classfactory__production__x.html">factory_production_x</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="classsettings.html">settings</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="classworld.html">world</a>&#160;&#160;&#160;</td></tr>
<tr><td valign="top"><a class="el" href="classconvoy__list__x.html">convoy_list_x</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="classfactory__x.html">factory_x</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="classobj__desc__time__x.html">obj_desc_time_x</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="classsquare__x.html">square_x</a>&#160;&#160;&#160;</td><td></td></tr>
</td><td valign="top"><a class="el" href="classschedule__x.html">schedule_x</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="classway__desc__x.html">way_desc_x</a>&#160;&#160;&#160;</td></tr>
<tr><td valign="top"><a class="el" href="classcity__x.html">city_x</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="classfactory__production__x.html">factory_production_x</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="classsettings.html">settings</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="classway__x.html">way_x</a>&#160;&#160;&#160;</td></tr>
<tr><td valign="top"><a class="el" href="classconvoy__list__x.html">convoy_list_x</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="classfactory__x.html">factory_x</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="classobj__desc__time__x.html">obj_desc_time_x</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="classsquare__x.html">square_x</a>&#160;&#160;&#160;</td><td valign="top"><a class="el" href="classworld.html">world</a>&#160;&#160;&#160;</td></tr>
<tr><td valign="top"><a class="el" href="classconvoy__x.html">convoy_x</a>&#160;&#160;&#160;</td><td rowspan="2" valign="bottom"><a name="letter_G"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;G&#160;&#160;</div></td></tr></table>
</td><td valign="top"><a class="el" href="classobj__desc__transport__x.html">obj_desc_transport_x</a>&#160;&#160;&#160;</td><td rowspan="2" valign="bottom"><a name="letter_T"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;T&#160;&#160;</div></td></tr></table>
</td><td></td></tr>
Expand Down
Loading

0 comments on commit b2901fd

Please sign in to comment.