Files @ r5388:b83fe4735739
Branch filter:

Location: cpp/openttd-patchpack/source/landscape.c - annotation

Darkvater
(svn r7577) -Fix (r7565): Missed out some OSX files (Bjarni)
  1
  2
  3
  4
  5
  6
  7
  8
  9
 10
 11
 12
 13
 14
 15
 16
 17
 18
 19
 20
 21
 22
 23
 24
 25
 26
 27
 28
 29
 30
 31
 32
 33
 34
 35
 36
 37
 38
 39
 40
 41
 42
 43
 44
 45
 46
 47
 48
 49
 50
 51
 52
 53
 54
 55
 56
 57
 58
 59
 60
 61
 62
 63
 64
 65
 66
 67
 68
 69
 70
 71
 72
 73
 74
 75
 76
 77
 78
 79
 80
 81
 82
 83
 84
 85
 86
 87
 88
 89
 90
 91
 92
 93
 94
 95
 96
 97
 98
 99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
r2186:5ee653b1b5e1
r2186:5ee653b1b5e1
r0:d63b455452f6
r1891:c5c5466afa35
r5385:1c8ef6521bf2
r4300:642b2431578b
r3144:5b175fed4b0b
r2163:ae001e2aa5b0
r679:3a7b08cc8504
r2154:83cf5a3d6634
r1349:8fc4bdf6c588
r1363:a54abce83b4b
r1209:5955f8748394
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r2159:2c706fe6b0a7
r3144:5b175fed4b0b
r3111:3de136b83596
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r0:d63b455452f6
r183:d223ca41e3c0
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r4344:bff007ae1fd1
r4344:bff007ae1fd1
r0:d63b455452f6
r0:d63b455452f6
r1958:2c1ca22f82aa
r4344:bff007ae1fd1
r4344:bff007ae1fd1
r4253:3a466f02bf1e
r1958:2c1ca22f82aa
r1958:2c1ca22f82aa
r0:d63b455452f6
r3636:a8e0c73aca96
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r2952:e97f823d2dbe
r3636:a8e0c73aca96
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r183:d223ca41e3c0
r3636:a8e0c73aca96
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r3636:a8e0c73aca96
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r3636:a8e0c73aca96
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r3636:a8e0c73aca96
r3636:a8e0c73aca96
r3636:a8e0c73aca96
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r3636:a8e0c73aca96
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r3636:a8e0c73aca96
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r3636:a8e0c73aca96
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r3636:a8e0c73aca96
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r3636:a8e0c73aca96
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r3636:a8e0c73aca96
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r3636:a8e0c73aca96
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r3636:a8e0c73aca96
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r3636:a8e0c73aca96
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r3636:a8e0c73aca96
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r3636:a8e0c73aca96
r0:d63b455452f6
r0:d63b455452f6
r183:d223ca41e3c0
r3636:a8e0c73aca96
r0:d63b455452f6
r0:d63b455452f6
r3636:a8e0c73aca96
r3636:a8e0c73aca96
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r2951:a52cbb930051
r0:d63b455452f6
r4231:a4beff4c54cb
r0:d63b455452f6
r4231:a4beff4c54cb
r0:d63b455452f6
r0:d63b455452f6
r4061:495187cf2c6b
r4061:495187cf2c6b
r37:ead8cba1b6f2
r4061:495187cf2c6b
r3636:a8e0c73aca96
r50:c2e5c03f18d8
r4061:495187cf2c6b
r4061:495187cf2c6b
r4061:495187cf2c6b
r4061:495187cf2c6b
r4061:495187cf2c6b
r4061:495187cf2c6b
r4061:495187cf2c6b
r4061:495187cf2c6b
r4061:495187cf2c6b
r4061:495187cf2c6b
r39:c8e54423ac24
r4061:495187cf2c6b
r4990:059cd9c4cc09
r4990:059cd9c4cc09
r4990:059cd9c4cc09
r4990:059cd9c4cc09
r4990:059cd9c4cc09
r4990:059cd9c4cc09
r4990:059cd9c4cc09
r37:ead8cba1b6f2
r37:ead8cba1b6f2
r4061:495187cf2c6b
r4061:495187cf2c6b
r4061:495187cf2c6b
r4061:495187cf2c6b
r4061:495187cf2c6b
r4061:495187cf2c6b
r4061:495187cf2c6b
r4990:059cd9c4cc09
r4990:059cd9c4cc09
r4990:059cd9c4cc09
r4990:059cd9c4cc09
r4990:059cd9c4cc09
r4990:059cd9c4cc09
r4990:059cd9c4cc09
r4061:495187cf2c6b
r4061:495187cf2c6b
r4061:495187cf2c6b
r0:d63b455452f6
r0:d63b455452f6
r4240:933629caab83
r4061:495187cf2c6b
r4061:495187cf2c6b
r39:c8e54423ac24
r4061:495187cf2c6b
r4061:495187cf2c6b
r4061:495187cf2c6b
r37:ead8cba1b6f2
r4253:3a466f02bf1e
r4253:3a466f02bf1e
r37:ead8cba1b6f2
r4253:3a466f02bf1e
r4253:3a466f02bf1e
r4253:3a466f02bf1e
r4253:3a466f02bf1e
r4253:3a466f02bf1e
r4253:3a466f02bf1e
r3645:de3cfb719308
r4253:3a466f02bf1e
r4253:3a466f02bf1e
r4253:3a466f02bf1e
r4253:3a466f02bf1e
r4253:3a466f02bf1e
r4253:3a466f02bf1e
r4253:3a466f02bf1e
r4253:3a466f02bf1e
r4253:3a466f02bf1e
r4253:3a466f02bf1e
r4253:3a466f02bf1e
r4253:3a466f02bf1e
r4253:3a466f02bf1e
r4253:3a466f02bf1e
r4253:3a466f02bf1e
r4253:3a466f02bf1e
r0:d63b455452f6
r4253:3a466f02bf1e
r4253:3a466f02bf1e
r4253:3a466f02bf1e
r4253:3a466f02bf1e
r4246:d7c3c79a1959
r4253:3a466f02bf1e
r4246:d7c3c79a1959
r4253:3a466f02bf1e
r4253:3a466f02bf1e
r4253:3a466f02bf1e
r4253:3a466f02bf1e
r4253:3a466f02bf1e
r4253:3a466f02bf1e
r4253:3a466f02bf1e
r4246:d7c3c79a1959
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r1589:e83980b96e9f
r0:d63b455452f6
r3447:1cf4fdb2e0fa
r2955:af9992213b85
r0:d63b455452f6
r0:d63b455452f6
r1589:e83980b96e9f
r0:d63b455452f6
r1214:2ed99b1b4b97
r0:d63b455452f6
r0:d63b455452f6
r1589:e83980b96e9f
r0:d63b455452f6
r1214:2ed99b1b4b97
r0:d63b455452f6
r0:d63b455452f6
r1589:e83980b96e9f
r0:d63b455452f6
r0:d63b455452f6
r1214:2ed99b1b4b97
r0:d63b455452f6
r0:d63b455452f6
r1589:e83980b96e9f
r0:d63b455452f6
r1214:2ed99b1b4b97
r0:d63b455452f6
r0:d63b455452f6
r1589:e83980b96e9f
r0:d63b455452f6
r1214:2ed99b1b4b97
r0:d63b455452f6
r0:d63b455452f6
r1589:e83980b96e9f
r0:d63b455452f6
r1214:2ed99b1b4b97
r0:d63b455452f6
r0:d63b455452f6
r1775:0a21bebb2211
r3491:10ed78e15d31
r1775:0a21bebb2211
r1775:0a21bebb2211
r0:d63b455452f6
r3491:10ed78e15d31
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r1214:2ed99b1b4b97
r0:d63b455452f6
r0:d63b455452f6
r1793:7bff71353e69
r3491:10ed78e15d31
r1793:7bff71353e69
r1793:7bff71353e69
r1793:7bff71353e69
r3491:10ed78e15d31
r0:d63b455452f6
r1793:7bff71353e69
r3491:10ed78e15d31
r3491:10ed78e15d31
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r2934:94158a76ebcf
r1793:7bff71353e69
r889:ed9a6e2f24bb
r889:ed9a6e2f24bb
r0:d63b455452f6
r3493:a0deb387eebe
r3493:a0deb387eebe
r3493:a0deb387eebe
r3493:a0deb387eebe
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r3493:a0deb387eebe
r3493:a0deb387eebe
r3493:a0deb387eebe
r1793:7bff71353e69
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r1793:7bff71353e69
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r3493:a0deb387eebe
r0:d63b455452f6
r0:d63b455452f6
r1793:7bff71353e69
r0:d63b455452f6
r3645:de3cfb719308
r1359:705db2bcef93
r1359:705db2bcef93
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r1793:7bff71353e69
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r927:dedf35f80507
r927:dedf35f80507
r0:d63b455452f6
r1093:18f56ef2d029
r0:d63b455452f6
r1589:e83980b96e9f
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r863:a3262138da98
r0:d63b455452f6
r1214:2ed99b1b4b97
r0:d63b455452f6
r926:fcf36609eb94
r0:d63b455452f6
r0:d63b455452f6
r1981:addba4bccc89
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r863:a3262138da98
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r2055:3f0149453249
r0:d63b455452f6
r3078:ecb7cd974842
r3078:ecb7cd974842
r3078:ecb7cd974842
r3078:ecb7cd974842
r3078:ecb7cd974842
r2049:7e26d55f0f4c
r3078:ecb7cd974842
r3078:ecb7cd974842
r3447:1cf4fdb2e0fa
r3078:ecb7cd974842
r5385:1c8ef6521bf2
r5385:1c8ef6521bf2
r3078:ecb7cd974842
r3078:ecb7cd974842
r2049:7e26d55f0f4c
r3078:ecb7cd974842
r0:d63b455452f6
r0:d63b455452f6
r1093:18f56ef2d029
r0:d63b455452f6
r4000:702cb45b8eab
r4300:642b2431578b
r4300:642b2431578b
r0:d63b455452f6
r1275:1add26e56354
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r4344:bff007ae1fd1
r4344:bff007ae1fd1
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r1275:1add26e56354
r1275:1add26e56354
r1275:1add26e56354
r1275:1add26e56354
r1384:8ff919da98b4
r1275:1add26e56354
r2049:7e26d55f0f4c
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r1384:8ff919da98b4
r0:d63b455452f6
r856:e23ff9905ff0
r927:dedf35f80507
r0:d63b455452f6
r0:d63b455452f6
r2951:a52cbb930051
r0:d63b455452f6
r2140:efb49af98a17
r1275:1add26e56354
r1384:8ff919da98b4
r1384:8ff919da98b4
r1275:1add26e56354
r1384:8ff919da98b4
r1384:8ff919da98b4
r1275:1add26e56354
r1384:8ff919da98b4
r0:d63b455452f6
r0:d63b455452f6
r1273:bd24c8d9000d
r1273:bd24c8d9000d
r1273:bd24c8d9000d
r1273:bd24c8d9000d
r1273:bd24c8d9000d
r1273:bd24c8d9000d
r1273:bd24c8d9000d
r1273:bd24c8d9000d
r1273:bd24c8d9000d
r1273:bd24c8d9000d
r1273:bd24c8d9000d
r1273:bd24c8d9000d
r1273:bd24c8d9000d
r1273:bd24c8d9000d
r1273:bd24c8d9000d
r1273:bd24c8d9000d
r1273:bd24c8d9000d
r1273:bd24c8d9000d
r1273:bd24c8d9000d
r1273:bd24c8d9000d
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r2951:a52cbb930051
r2951:a52cbb930051
r0:d63b455452f6
r2049:7e26d55f0f4c
r0:d63b455452f6
r1275:1add26e56354
r1275:1add26e56354
r0:d63b455452f6
r2049:7e26d55f0f4c
r1275:1add26e56354
r1275:1add26e56354
r1275:1add26e56354
r2049:7e26d55f0f4c
r1275:1add26e56354
r1275:1add26e56354
r1275:1add26e56354
r1981:addba4bccc89
r1275:1add26e56354
r1275:1add26e56354
r1275:1add26e56354
r1275:1add26e56354
r0:d63b455452f6
r2049:7e26d55f0f4c
r1275:1add26e56354
r1275:1add26e56354
r1275:1add26e56354
r2049:7e26d55f0f4c
r1275:1add26e56354
r1981:addba4bccc89
r1275:1add26e56354
r1275:1add26e56354
r1275:1add26e56354
r1275:1add26e56354
r1275:1add26e56354
r1275:1add26e56354
r1981:addba4bccc89
r0:d63b455452f6
r2049:7e26d55f0f4c
r1275:1add26e56354
r1275:1add26e56354
r1275:1add26e56354
r2049:7e26d55f0f4c
r1275:1add26e56354
r1275:1add26e56354
r1275:1add26e56354
r1981:addba4bccc89
r1275:1add26e56354
r1275:1add26e56354
r1275:1add26e56354
r1275:1add26e56354
r1981:addba4bccc89
r0:d63b455452f6
r2049:7e26d55f0f4c
r1275:1add26e56354
r1275:1add26e56354
r1275:1add26e56354
r2049:7e26d55f0f4c
r1275:1add26e56354
r1981:addba4bccc89
r1278:da0c663a93f3
r1275:1add26e56354
r1275:1add26e56354
r1275:1add26e56354
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r1093:18f56ef2d029
r0:d63b455452f6
r1275:1add26e56354
r4300:642b2431578b
r909:898755bd4512
r1275:1add26e56354
r0:d63b455452f6
r909:898755bd4512
r4300:642b2431578b
r4300:642b2431578b
r909:898755bd4512
r909:898755bd4512
r1184:b10cbb5be53e
r1044:d63b879a32db
r909:898755bd4512
r909:898755bd4512
r3379:e72a0eb00c30
r909:898755bd4512
r183:d223ca41e3c0
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r0:d63b455452f6
r4300:642b2431578b
r0:d63b455452f6
r909:898755bd4512
r4300:642b2431578b
r4300:642b2431578b
r909:898755bd4512
r909:898755bd4512
r909:898755bd4512
r3447:1cf4fdb2e0fa
r909:898755bd4512
r909:898755bd4512
r3379:e72a0eb00c30
r909:898755bd4512
r0:d63b455452f6
r0:d63b455452f6
r4300:642b2431578b
r0:d63b455452f6
r4300:642b2431578b
r1275:1add26e56354
r1275:1add26e56354
r0:d63b455452f6
r183:d223ca41e3c0
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r183:d223ca41e3c0
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r3017:1bf2ce772ffa
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r183:d223ca41e3c0
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r0:d63b455452f6
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r0:d63b455452f6
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r3017:1bf2ce772ffa
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r4300:642b2431578b
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r3017:1bf2ce772ffa
r0:d63b455452f6
r0:d63b455452f6
r1093:18f56ef2d029
r1093:18f56ef2d029
r1093:18f56ef2d029
r1093:18f56ef2d029
r0:d63b455452f6
r1093:18f56ef2d029
r1093:18f56ef2d029
r0:d63b455452f6
r1093:18f56ef2d029
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r0:d63b455452f6
r1981:addba4bccc89
r2150:8d17c2dcd791
r2150:8d17c2dcd791
r1174:4ffa62f5467c
r0:d63b455452f6
r0:d63b455452f6
r1589:e83980b96e9f
r0:d63b455452f6
r926:fcf36609eb94
r0:d63b455452f6
/* $Id$ */

#include "stdafx.h"
#include "openttd.h"
#include "bridge_map.h"
#include "heightmap.h"
#include "clear_map.h"
#include "functions.h"
#include "map.h"
#include "player.h"
#include "spritecache.h"
#include "table/sprites.h"
#include "tile.h"
#include <stdarg.h>
#include "viewport.h"
#include "command.h"
#include "vehicle.h"
#include "variables.h"
#include "void_map.h"
#include "water_map.h"
#include "tgp.h"
#include "genworld.h"
#include "heightmap.h"

extern const TileTypeProcs
	_tile_type_clear_procs,
	_tile_type_rail_procs,
	_tile_type_road_procs,
	_tile_type_town_procs,
	_tile_type_trees_procs,
	_tile_type_station_procs,
	_tile_type_water_procs,
	_tile_type_dummy_procs,
	_tile_type_industry_procs,
	_tile_type_tunnelbridge_procs,
	_tile_type_unmovable_procs;

const TileTypeProcs * const _tile_type_procs[16] = {
	&_tile_type_clear_procs,
	&_tile_type_rail_procs,
	&_tile_type_road_procs,
	&_tile_type_town_procs,
	&_tile_type_trees_procs,
	&_tile_type_station_procs,
	&_tile_type_water_procs,
	&_tile_type_dummy_procs,
	&_tile_type_industry_procs,
	&_tile_type_tunnelbridge_procs,
	&_tile_type_unmovable_procs,
};

/* landscape slope => sprite */
const byte _tileh_to_sprite[32] = {
	0, 1, 2, 3, 4, 5, 6,  7, 8, 9, 10, 11, 12, 13, 14, 0,
	0, 0, 0, 0, 0, 0, 0, 16, 0, 0,  0, 17,  0, 15, 18, 0,
};

const byte _inclined_tileh[] = {
	SLOPE_SW,  SLOPE_NW,  SLOPE_SW,  SLOPE_SE, SLOPE_NE, SLOPE_SE, SLOPE_NE, SLOPE_NW,
	SLOPE_E,   SLOPE_N,   SLOPE_W,   SLOPE_S,
	SLOPE_NWS, SLOPE_WSE, SLOPE_SEN, SLOPE_ENW
};


uint GetPartialZ(int x, int y, Slope corners)
{
	int z = 0;

	switch (corners) {
	case SLOPE_W:
		if (x - y >= 0)
			z = (x - y) >> 1;
		break;

	case SLOPE_S:
		y^=0xF;
		if ( (x - y) >= 0)
			z = (x - y) >> 1;
		break;

	case SLOPE_SW:
		z = (x>>1) + 1;
		break;

	case SLOPE_E:
		if (y - x >= 0)
			z = (y - x) >> 1;
		break;

	case SLOPE_EW:
	case SLOPE_NS:
	case SLOPE_ELEVATED:
		z = 4;
		break;

	case SLOPE_SE:
		z = (y>>1) + 1;
		break;

	case SLOPE_WSE:
		z = 8;
		y^=0xF;
		if (x - y < 0)
			z += (x - y) >> 1;
		break;

	case SLOPE_N:
		y ^= 0xF;
		if (y - x >= 0)
			z = (y - x) >> 1;
		break;

	case SLOPE_NW:
		z = (y^0xF)>>1;
		break;

	case SLOPE_NWS:
		z = 8;
		if (x - y < 0)
			z += (x - y) >> 1;
		break;

	case SLOPE_NE:
		z = (x^0xF)>>1;
		break;

	case SLOPE_ENW:
		z = 8;
		y ^= 0xF;
		if (y - x < 0)
			z += (y - x) >> 1;
		break;

	case SLOPE_SEN:
		z = 8;
		if (y - x < 0)
			z += (y - x) >> 1;
		break;

	case SLOPE_STEEP_S:
		z = 1 + ((x+y)>>1);
		break;

	case SLOPE_STEEP_W:
		z = 1 + ((x+(y^0xF))>>1);
		break;

	case SLOPE_STEEP_N:
		z = 1 + (((x^0xF)+(y^0xF))>>1);
		break;

	case SLOPE_STEEP_E:
		z = 1 + (((x^0xF)+(y^0xF))>>1);
		break;

		default: break;
	}

	return z;
}

uint GetSlopeZ(int x, int y)
{
	TileIndex tile = TileVirtXY(x, y);

	return _tile_type_procs[GetTileType(tile)]->get_slope_z_proc(tile, x, y);
}


static Slope GetFoundationSlope(TileIndex tile, uint* z)
{
	Slope tileh = GetTileSlope(tile, z);
	Slope slope = _tile_type_procs[GetTileType(tile)]->get_slope_tileh_proc(tile, tileh);

	// Flatter slope -> higher base height
	if (slope < tileh) *z += TILE_HEIGHT;
	return slope;
}


static bool HasFoundationNW(TileIndex tile, Slope slope_here, uint z_here)
{
	uint z;
	Slope slope = GetFoundationSlope(TILE_ADDXY(tile, 0, -1), &z);

	return
		(
			z_here + (slope_here & SLOPE_N ? TILE_HEIGHT : 0) + (slope_here == SLOPE_STEEP_N ? TILE_HEIGHT : 0) >
			z      + (slope      & SLOPE_E ? TILE_HEIGHT : 0) + (slope      == SLOPE_STEEP_E ? TILE_HEIGHT : 0)
		) || (
			z_here + (slope_here & SLOPE_W ? TILE_HEIGHT : 0) + (slope_here == SLOPE_STEEP_W ? TILE_HEIGHT : 0) >
			z      + (slope      & SLOPE_S ? TILE_HEIGHT : 0) + (slope      == SLOPE_STEEP_S ? TILE_HEIGHT : 0)
		);
}


static bool HasFoundationNE(TileIndex tile, Slope slope_here, uint z_here)
{
	uint z;
	Slope slope = GetFoundationSlope(TILE_ADDXY(tile, -1, 0), &z);

	return
		(
			z_here + (slope_here & SLOPE_N ? TILE_HEIGHT : 0) + (slope_here == SLOPE_STEEP_N ? TILE_HEIGHT : 0) >
			z      + (slope      & SLOPE_W ? TILE_HEIGHT : 0) + (slope      == SLOPE_STEEP_W ? TILE_HEIGHT : 0)
		) || (
			z_here + (slope_here & SLOPE_E ? TILE_HEIGHT : 0) + (slope_here == SLOPE_STEEP_E ? TILE_HEIGHT : 0) >
			z      + (slope      & SLOPE_S ? TILE_HEIGHT : 0) + (slope      == SLOPE_STEEP_S ? TILE_HEIGHT : 0)
		);
}


void DrawFoundation(TileInfo *ti, uint f)
{
	uint32 sprite_base = SPR_SLOPES_BASE - 15;
	Slope slope;
	uint z;

	slope = GetFoundationSlope(ti->tile, &z);
	if (!HasFoundationNW(ti->tile, slope, z)) sprite_base += 22;
	if (!HasFoundationNE(ti->tile, slope, z)) sprite_base += 44;

	if (IsSteepSlope(ti->tileh)) {
		uint32 lower_base;

		// Lower part of foundation
		lower_base = sprite_base;
		if (lower_base == SPR_SLOPES_BASE - 15) lower_base = SPR_FOUNDATION_BASE;
		AddSortableSpriteToDraw(
			lower_base + (ti->tileh & ~SLOPE_STEEP), ti->x, ti->y, 16, 16, 7, ti->z
		);
		ti->z += TILE_HEIGHT;
		ti->tileh = _inclined_tileh[f - 15];
		if (f < 15 + 8) {
			// inclined
			AddSortableSpriteToDraw(sprite_base + f, ti->x, ti->y, 16, 16, 1, ti->z);
			OffsetGroundSprite(31, 9);
		} else if (f >= 15 + 8 + 4) {
			// three corners raised
			uint32 upper = sprite_base + 15 + (f - 15 - 8 - 4) * 2;

			AddSortableSpriteToDraw(upper, ti->x, ti->y, 16, 16, 1, ti->z);
			AddChildSpriteScreen(upper + 1, 31, 9);
			OffsetGroundSprite(31, 9);
		} else {
			// one corner raised
			OffsetGroundSprite(31, 1);
		}
	} else {
		if (f < 15) {
			// leveled foundation
			// Use the original slope sprites if NW and NE borders should be visible
			if (sprite_base  == SPR_SLOPES_BASE - 15) sprite_base = SPR_FOUNDATION_BASE;

			AddSortableSpriteToDraw(sprite_base + f, ti->x, ti->y, 16, 16, 7, ti->z);
			ti->z += TILE_HEIGHT;
			ti->tileh = SLOPE_FLAT;
			OffsetGroundSprite(31, 1);
		} else {
			// inclined foundation
			AddSortableSpriteToDraw(sprite_base + f, ti->x, ti->y, 16, 16, 1, ti->z);
			ti->tileh = _inclined_tileh[f - 15];
			OffsetGroundSprite(31, 9);
		}
	}
}

void DoClearSquare(TileIndex tile)
{
	MakeClear(tile, CLEAR_GRASS, _generating_world ? 3 : 0);
	MarkTileDirtyByTile(tile);
}

uint32 GetTileTrackStatus(TileIndex tile, TransportType mode)
{
	return _tile_type_procs[GetTileType(tile)]->get_tile_track_status_proc(tile, mode);
}

void ChangeTileOwner(TileIndex tile, byte old_player, byte new_player)
{
	_tile_type_procs[GetTileType(tile)]->change_tile_owner_proc(tile, old_player, new_player);
}

void GetAcceptedCargo(TileIndex tile, AcceptedCargo ac)
{
	memset(ac, 0, sizeof(AcceptedCargo));
	_tile_type_procs[GetTileType(tile)]->get_accepted_cargo_proc(tile, ac);
}

void AnimateTile(TileIndex tile)
{
	_tile_type_procs[GetTileType(tile)]->animate_tile_proc(tile);
}

void ClickTile(TileIndex tile)
{
	_tile_type_procs[GetTileType(tile)]->click_tile_proc(tile);
}

void GetTileDesc(TileIndex tile, TileDesc *td)
{
	_tile_type_procs[GetTileType(tile)]->get_tile_desc_proc(tile, td);
}

/** Clear a piece of landscape
 * @param tile tile to clear
 * @param p1 unused
 * @param p2 unused
 */
int32 CmdLandscapeClear(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
{
	SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION);

	return _tile_type_procs[GetTileType(tile)]->clear_tile_proc(tile, flags);
}

/** Clear a big piece of landscape
 * @param tile end tile of area dragging
 * @param p1 start tile of area dragging
 * @param p2 unused
 */
int32 CmdClearArea(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
{
	int32 cost, ret, money;
	int ex;
	int ey;
	int sx,sy;
	int x,y;
	bool success = false;

	if (p1 >= MapSize()) return CMD_ERROR;

	SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION);

	// make sure sx,sy are smaller than ex,ey
	ex = TileX(tile);
	ey = TileY(tile);
	sx = TileX(p1);
	sy = TileY(p1);
	if (ex < sx) intswap(ex, sx);
	if (ey < sy) intswap(ey, sy);

	money = GetAvailableMoneyForCommand();
	cost = 0;

	for (x = sx; x <= ex; ++x) {
		for (y = sy; y <= ey; ++y) {
			ret = DoCommand(TileXY(x, y), 0, 0, flags & ~DC_EXEC, CMD_LANDSCAPE_CLEAR);
			if (CmdFailed(ret)) continue;
			cost += ret;
			success = true;

			if (flags & DC_EXEC) {
				if (ret > 0 && (money -= ret) < 0) {
					_additional_cash_required = ret;
					return cost - ret;
				}
				DoCommand(TileXY(x, y), 0, 0, flags, CMD_LANDSCAPE_CLEAR);

				// draw explosion animation...
				if ((x == sx || x == ex) && (y == sy || y == ey)) {
					// big explosion in each corner, or small explosion for single tiles
					CreateEffectVehicleAbove(x * TILE_SIZE + TILE_SIZE / 2, y * TILE_SIZE + TILE_SIZE / 2, 2,
						sy == ey && sx == ex ? EV_EXPLOSION_SMALL : EV_EXPLOSION_LARGE
					);
				}
			}
		}
	}

	return (success) ? cost : CMD_ERROR;
}


#define TILELOOP_BITS 4
#define TILELOOP_SIZE (1 << TILELOOP_BITS)
#define TILELOOP_ASSERTMASK ((TILELOOP_SIZE-1) + ((TILELOOP_SIZE-1) << MapLogX()))
#define TILELOOP_CHKMASK (((1 << (MapLogX() - TILELOOP_BITS))-1) << TILELOOP_BITS)

void RunTileLoop(void)
{
	TileIndex tile;
	uint count;

	tile = _cur_tileloop_tile;

	assert( (tile & ~TILELOOP_ASSERTMASK) == 0);
	count = (MapSizeX() / TILELOOP_SIZE) * (MapSizeY() / TILELOOP_SIZE);
	do {
		_tile_type_procs[GetTileType(tile)]->tile_loop_proc(tile);

		if (TileX(tile) < MapSizeX() - TILELOOP_SIZE) {
			tile += TILELOOP_SIZE; /* no overflow */
		} else {
			tile = TILE_MASK(tile - TILELOOP_SIZE * (MapSizeX() / TILELOOP_SIZE - 1) + TileDiffXY(0, TILELOOP_SIZE)); /* x would overflow, also increase y */
		}
	} while (--count);
	assert( (tile & ~TILELOOP_ASSERTMASK) == 0);

	tile += 9;
	if (tile & TILELOOP_CHKMASK)
		tile = (tile + MapSizeX()) & TILELOOP_ASSERTMASK;
	_cur_tileloop_tile = tile;
}

void InitializeLandscape(void)
{
	uint maxx = MapMaxX();
	uint maxy = MapMaxY();
	uint sizex = MapSizeX();
	uint x;
	uint y;

	for (y = 0; y < maxy; y++) {
		for (x = 0; x < maxx; x++) {
			MakeClear(sizex * y + x, CLEAR_GRASS, 3);
			SetTileHeight(sizex * y + x, 0);
			_m[sizex * y + x].extra = 0;
			ClearBridgeMiddle(sizex * y + x);
		}
		MakeVoid(sizex * y + x);
	}
	for (x = 0; x < sizex; x++) MakeVoid(sizex * y + x);
}

void ConvertGroundTilesIntoWaterTiles(void)
{
	TileIndex tile;
	uint z;
	Slope slope;

	for (tile = 0; tile < MapSize(); ++tile) {
		slope = GetTileSlope(tile, &z);
		if (IsTileType(tile, MP_CLEAR) && z == 0) {
			/* Make both water for tiles at level 0
			 * and make shore, as that looks much better
			 * during the generation. */
			switch (slope) {
				case SLOPE_FLAT:
					MakeWater(tile);
					break;

				case SLOPE_N:
				case SLOPE_E:
				case SLOPE_S:
				case SLOPE_W:
				case SLOPE_NW:
				case SLOPE_SW:
				case SLOPE_SE:
				case SLOPE_NE:
					MakeShore(tile);
					break;

				default:
					break;
			}
		}
	}
}

static const byte _genterrain_tbl_1[5] = { 10, 22, 33, 37, 4  };
static const byte _genterrain_tbl_2[5] = {  0,  0,  0,  0, 33 };

static void GenerateTerrain(int type, int flag)
{
	uint32 r;
	uint x;
	uint y;
	uint w;
	uint h;
	const Sprite* template;
	const byte *p;
	Tile* tile;
	byte direction;

	r = Random();
	template = GetSprite((((r >> 24) * _genterrain_tbl_1[type]) >> 8) + _genterrain_tbl_2[type] + 4845);

	x = r & MapMaxX();
	y = (r >> MapLogX()) & MapMaxY();


	if (x < 2 || y < 2) return;

	direction = GB(r, 22, 2);
	if (direction & 1) {
		w = template->height;
		h = template->width;
	} else {
		w = template->width;
		h = template->height;
	}
	p = template->data;

	if (flag & 4) {
		uint xw = x * MapSizeY();
		uint yw = y * MapSizeX();
		uint bias = (MapSizeX() + MapSizeY()) * 16;

		switch (flag & 3) {
			case 0:
				if (xw + yw > MapSize() - bias) return;
				break;

			case 1:
				if (yw < xw + bias) return;
				break;

			case 2:
				if (xw + yw < MapSize() + bias) return;
				break;

			case 3:
				if (xw < yw + bias) return;
				break;
		}
	}

	if (x + w >= MapMaxX() - 1) return;
	if (y + h >= MapMaxY() - 1) return;

	tile = &_m[TileXY(x, y)];

	switch (direction) {
		case 0:
			do {
				Tile* tile_cur = tile;
				uint w_cur;

				for (w_cur = w; w_cur != 0; --w_cur) {
					if (*p >= tile_cur->type_height) tile_cur->type_height = *p;
					p++;
					tile_cur++;
				}
				tile += TileDiffXY(0, 1);
			} while (--h != 0);
			break;

		case 1:
			do {
				Tile* tile_cur = tile;
				uint h_cur;

				for (h_cur = h; h_cur != 0; --h_cur) {
					if (*p >= tile_cur->type_height) tile_cur->type_height = *p;
					p++;
					tile_cur += TileDiffXY(0, 1);
				}
				tile++;
			} while (--w != 0);
			break;

		case 2:
			tile += TileDiffXY(w - 1, 0);
			do {
				Tile* tile_cur = tile;
				uint w_cur;

				for (w_cur = w; w_cur != 0; --w_cur) {
					if (*p >= tile_cur->type_height) tile_cur->type_height = *p;
					p++;
					tile_cur--;
				}
				tile += TileDiffXY(0, 1);
			} while (--h != 0);
			break;

		case 3:
			tile += TileDiffXY(0, h - 1);
			do {
				Tile* tile_cur = tile;
				uint h_cur;

				for (h_cur = h; h_cur != 0; --h_cur) {
					if (*p >= tile_cur->type_height) tile_cur->type_height = *p;
					p++;
					tile_cur -= TileDiffXY(0, 1);
				}
				tile++;
			} while (--w != 0);
			break;
	}
}


#include "table/genland.h"

static void CreateDesertOrRainForest(void)
{
	TileIndex tile;
	TileIndex update_freq = MapSize() / 4;
	const TileIndexDiffC *data;
	uint i;

	for (tile = 0; tile != MapSize(); ++tile) {
		if ((tile % update_freq) == 0) IncreaseGeneratingWorldProgress(GWP_LANDSCAPE);

		for (data = _make_desert_or_rainforest_data;
				data != endof(_make_desert_or_rainforest_data); ++data) {
			TileIndex t = TILE_MASK(tile + ToTileIndexDiff(*data));
			if (TileHeight(t) >= 4 || IsTileType(t, MP_WATER)) break;
		}
		if (data == endof(_make_desert_or_rainforest_data))
			SetTropicZone(tile, TROPICZONE_DESERT);
	}

	for (i = 0; i != 256; i++) {
		if ((i % 64) == 0) IncreaseGeneratingWorldProgress(GWP_LANDSCAPE);

		RunTileLoop();
	}

	for (tile = 0; tile != MapSize(); ++tile) {
		if ((tile % update_freq) == 0) IncreaseGeneratingWorldProgress(GWP_LANDSCAPE);

		for (data = _make_desert_or_rainforest_data;
				data != endof(_make_desert_or_rainforest_data); ++data) {
			TileIndex t = TILE_MASK(tile + ToTileIndexDiff(*data));
			if (IsTileType(t, MP_CLEAR) && IsClearGround(t, CLEAR_DESERT)) break;
		}
		if (data == endof(_make_desert_or_rainforest_data))
			SetTropicZone(tile, TROPICZONE_RAINFOREST);
	}
}

void GenerateLandscape(byte mode)
{
	const int gwp_desert_amount = 4 + 8;
	uint i;
	uint flag;
	uint32 r;

	if (mode == GW_HEIGHTMAP) {
		SetGeneratingWorldProgress(GWP_LANDSCAPE, (_opt.landscape == LT_DESERT) ? 1 + gwp_desert_amount : 1);
		LoadHeightmap(_file_to_saveload.name);
		IncreaseGeneratingWorldProgress(GWP_LANDSCAPE);
	} else if (_patches.land_generator == LG_TERRAGENESIS) {
		SetGeneratingWorldProgress(GWP_LANDSCAPE, (_opt.landscape == LT_DESERT) ? 3 + gwp_desert_amount : 3);
		GenerateTerrainPerlin();
	} else {
		switch (_opt.landscape) {
			case LT_HILLY:
				SetGeneratingWorldProgress(GWP_LANDSCAPE, 2);

				for (i = ScaleByMapSize((Random() & 0x7F) + 950); i != 0; --i) {
					GenerateTerrain(2, 0);
				}
				IncreaseGeneratingWorldProgress(GWP_LANDSCAPE);

				r = Random();
				flag = GB(r, 0, 2) | 4;
				for (i = ScaleByMapSize(GB(r, 16, 7) + 450); i != 0; --i) {
					GenerateTerrain(4, flag);
				}
				IncreaseGeneratingWorldProgress(GWP_LANDSCAPE);
				break;

			case LT_DESERT:
				SetGeneratingWorldProgress(GWP_LANDSCAPE, 3 + gwp_desert_amount);

				for (i = ScaleByMapSize((Random() & 0x7F) + 170); i != 0; --i) {
					GenerateTerrain(0, 0);
				}
				IncreaseGeneratingWorldProgress(GWP_LANDSCAPE);

				r = Random();
				flag = GB(r, 0, 2) | 4;
				for (i = ScaleByMapSize(GB(r, 16, 8) + 1700); i != 0; --i) {
					GenerateTerrain(0, flag);
				}
				IncreaseGeneratingWorldProgress(GWP_LANDSCAPE);

				flag ^= 2;

				for (i = ScaleByMapSize((Random() & 0x7F) + 410); i != 0; --i) {
					GenerateTerrain(3, flag);
				}
				IncreaseGeneratingWorldProgress(GWP_LANDSCAPE);
				break;

			default:
				SetGeneratingWorldProgress(GWP_LANDSCAPE, 1);

				i = ScaleByMapSize((Random() & 0x7F) + (3 - _opt.diff.quantity_sea_lakes) * 256 + 100);
				for (; i != 0; --i) {
					GenerateTerrain(_opt.diff.terrain_type, 0);
				}
				IncreaseGeneratingWorldProgress(GWP_LANDSCAPE);
				break;
		}
	}

	ConvertGroundTilesIntoWaterTiles();

	if (_opt.landscape == LT_DESERT) CreateDesertOrRainForest();
}

void OnTick_Town(void);
void OnTick_Trees(void);
void OnTick_Station(void);
void OnTick_Industry(void);

void OnTick_Players(void);
void OnTick_Train(void);

void CallLandscapeTick(void)
{
	OnTick_Town();
	OnTick_Trees();
	OnTick_Station();
	OnTick_Industry();

	OnTick_Players();
	OnTick_Train();
}

TileIndex AdjustTileCoordRandomly(TileIndex a, byte rng)
{
	int rn = rng;
	uint32 r = Random();

	return TILE_MASK(TileXY(
		TileX(a) + (GB(r, 0, 8) * rn * 2 >> 8) - rn,
		TileY(a) + (GB(r, 8, 8) * rn * 2 >> 8) - rn
	));
}

bool IsValidTile(TileIndex tile)
{
	return (tile < MapSizeX() * MapMaxY() && TileX(tile) != MapMaxX());
}