mirror of
https://github.com/vcmi/vcmi.git
synced 2025-01-24 03:47:18 +02:00
* support for Rampart town view
This commit is contained in:
parent
e6de19e17d
commit
3953eac82d
@ -387,6 +387,8 @@ int CCallback::getHeroSerial(const CGHeroInstance * hero)
|
||||
}
|
||||
const CCreatureSet* CCallback::getGarrison(const CGObjectInstance *obj)
|
||||
{
|
||||
if(!obj)
|
||||
return NULL;
|
||||
if(obj->ID == 34)
|
||||
return &(dynamic_cast<const CGHeroInstance*>(obj))->army;
|
||||
else if(obj->ID == 98)
|
||||
|
@ -31,6 +31,17 @@ public:
|
||||
|
||||
void CGarrisonSlot::hover (bool on)
|
||||
{
|
||||
if(on)
|
||||
{
|
||||
if(creature)
|
||||
{
|
||||
LOCPLINT->statusbar->print(creature->nameSing);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
LOCPLINT->statusbar->clear();
|
||||
}
|
||||
}
|
||||
void CGarrisonSlot::clickRight (tribool down)
|
||||
{
|
||||
|
@ -34,4 +34,46 @@
|
||||
0 41 TBCSUP_4.def 563 173
|
||||
0 42 TBCSUP_5.def 160 190
|
||||
0 43 TBCSUP_6.def 303 0
|
||||
0 20 TBCSBOAT.def 478 134
|
||||
0 20 TBCSBOAT.def 478 134
|
||||
1 16 TBRMBLAK.def 558 105
|
||||
1 9 TBRMCAS3.def 79 18
|
||||
1 8 TBRMCAS2.def 79 18
|
||||
1 7 TBRMCSTL.def 63 25
|
||||
1 30 TBRMDW_0.def 0 236
|
||||
1 31 TBRMDW_1.def 0 154
|
||||
1 32 TBRMDW_2.def 668 101
|
||||
1 33 TBRMDW_3.def 287 73
|
||||
1 34 TBRMDW_4.def 68 146
|
||||
1 35 TBRMDW_5.def 362 90
|
||||
1 36 TBRMDW_6.def 502 27
|
||||
1 21 TBRMEXT0.def 555 297
|
||||
1 22 TBRMEXT1.def 0 181
|
||||
1 27 TBRMEXT2.def 327 236
|
||||
1 27 TBRMEXT3.def 293 235
|
||||
1 27 TBRMEXT4.def 295 191
|
||||
1 29 TBRMEXT5.def 260 171
|
||||
1 43 TBRMUP_6.def 502 5
|
||||
1 42 TBRMUP_5.def 362 90
|
||||
1 41 TBRMUP_4.def 63 146
|
||||
1 40 TBRMUP_3.def 287 28
|
||||
1 39 TBRMUP_2.def 665 101
|
||||
1 38 TBRMUP_1.def 0 143
|
||||
1 37 TBRMUP_0.def 0 236
|
||||
1 5 TBRMTVRN.def 181 229
|
||||
1 17 TBRMSPEC.def 555 297
|
||||
1 15 TBRMSILO.def 245 324
|
||||
1 14 TBRMMARK.def 129 301
|
||||
1 0 TBRMMAGE.def 454 200
|
||||
1 1 TBRMMAG2.def 438 178
|
||||
1 2 TBRMMAG3.def 418 153
|
||||
1 3 TBRMMAG4.def 406 129
|
||||
1 4 TBRMMAG5.def 384 104
|
||||
1 25 TBRMHRD4.def 47 142
|
||||
1 24 TBRMHRD3.def 47 142
|
||||
1 19 TBRMHRD2.def 0 143
|
||||
1 18 TBRMHRD1.def 0 154
|
||||
1 26 TBRMHOLY.def 0 54
|
||||
1 10 TBRMHALL.def 565 216
|
||||
1 13 TBRMHAL4.def 534 187
|
||||
1 12 TBRMHAL3.def 538 187
|
||||
1 11 TBRMHAL2.def 538 187
|
@ -20,6 +20,39 @@ CASTLE 0
|
||||
34
|
||||
41
|
||||
END
|
||||
CASTLE 1
|
||||
35
|
||||
42
|
||||
33
|
||||
40
|
||||
16
|
||||
32
|
||||
39
|
||||
0
|
||||
1
|
||||
2
|
||||
3
|
||||
4
|
||||
31
|
||||
18
|
||||
38
|
||||
19
|
||||
34
|
||||
24
|
||||
41
|
||||
25
|
||||
5
|
||||
30
|
||||
37
|
||||
14
|
||||
15
|
||||
10
|
||||
11
|
||||
12
|
||||
13
|
||||
21
|
||||
22
|
||||
END
|
||||
EOD
|
||||
|
||||
------------------------------------------------------------------
|
||||
|
@ -34,4 +34,42 @@
|
||||
0 40 TBCSUP_3.def TOCSSWD2.bmp TZCSSWD2.bmp
|
||||
0 41 TBCSUP_4.def TOCSMON2.bmp TZCSMON2.bmp
|
||||
0 42 TBCSUP_5.def TOCSCAV2.bmp TZCSCAV2.bmp
|
||||
0 43 TBCSUP_6.def TOCSANG2.bmp TZCSANG2.bmp
|
||||
0 43 TBCSUP_6.def TOCSANG2.bmp TZCSANG2.bmp
|
||||
1 16 TBRMBLAK.def TORAID.bmp TZRAID.bmp
|
||||
1 8 TBRMCAS2.def TORCAS2.bmp TZRCAS2.bmp
|
||||
1 9 TBRMCAS3.def TORCAS3.bmp TZRCAS3.bmp
|
||||
1 7 TBRMCSTL.def TORCAS1.bmp TZRCAS1.bmp
|
||||
1 30 TBRMDW0_.def TORCEN1A.bmp TZRCEN1A.bmp
|
||||
1 31 TBRMDW_1.def TORDWF1.bmp TZRDWF1.bmp
|
||||
1 32 TBRMDW_2.def TORELF1.bmp TZRELF1.bmp
|
||||
1 33 TBRMDW_3.def TORPEG1A.bmp TZRPEG1A.bmp
|
||||
1 34 TBRMDW_4.def TORTRE1.bmp TZRTRE1.bmp
|
||||
1 35 TBRMDW_5.def TORUNI1.bmp TZRUNI1.bmp
|
||||
1 36 TBRMDW_6.def TORDR1AA.bmp TZRDR1AA.bmp
|
||||
1 21 TBRMEXT0.def TORGAR2A.bmp TZRGAR2A.bmp
|
||||
1 22 TBRMEXT1.def TORDWFT.bmp TZRDWFT.bmp
|
||||
1 11 TBRMHAL2.def TORHAL2.bmp TZRHAL2.bmp
|
||||
1 12 TBRMHAL3.def TORHAL3.bmp TZRHAL3.bmp
|
||||
1 13 TBRMHAL4.def TORHAL4.bmp TZRHAL4.bmp
|
||||
1 10 TBRMHALL.def TORHAL1.bmp TZRHAL1.bmp
|
||||
1 26 TBRMHOLY.def TORHOLY.bmp TZRHOLY.bmp
|
||||
1 18 TBRMHRD1.def TORDWF1H.bmp TZRDWF1H.bmp
|
||||
1 19 TBRMHRD2.def TORDWF2H.bmp TZRDWF2H.bmp
|
||||
1 24 TBRMHRD3.def TORTRE1H.bmp TZRTRE1H.bmp
|
||||
1 25 TBRMHRD4.def TORTRE2H.bmp TZRTRE2H.bmp
|
||||
1 1 TBRMMAG2.def TORMAG2.bmp TZRMAG2.bmp
|
||||
1 2 TBRMMAG3.def TORMAG3.bmp TZRMAG3.bmp
|
||||
1 3 TBRMMAG4.def TORMAG4.bmp TZRMAG4.bmp
|
||||
1 4 TBRMMAG5.def TORMAG5.bmp TZRMAG5.bmp
|
||||
1 0 TBRMMAGE.def TORMAG1.bmp TZRMAG1.bmp
|
||||
1 14 TBRMMARK.def TORMRK1.bmp TZRMRK1.bmp
|
||||
1 15 TBRMSILO.def TORMRK2.bmp TZRMRK2.bmp
|
||||
1 17 TBRMSPEC.def TORGAR1A.bmp TZRGAR1A.bmp
|
||||
1 5 TBRMTVRN.def TORTAV.bmp TZRTAV.bmp
|
||||
1 37 TBRMUP0_.def TORCEN2A.bmp TZRCEN2A.bmp
|
||||
1 38 TBRMUP_1.def TORDWF2.bmp TZRDWF2.bmp
|
||||
1 39 TBRMUP_2.def TORELF2.bmp TZRELF2.bmp
|
||||
1 40 TBRMUP_3.def TORPEG2A.bmp TZRPEG2A.bmp
|
||||
1 41 TBRMUP_4.def TORTRE2.bmp TZRTRE2.bmp
|
||||
1 42 TBRMUP_5.def TORUNI2.bmp TZRUNI2.bmp
|
||||
1 43 TBRMUP_6.def TORDR2AA.bmp TZRDR2AA.bmp
|
@ -7,6 +7,10 @@ GROUP
|
||||
3
|
||||
4
|
||||
GROUP
|
||||
7
|
||||
8
|
||||
9
|
||||
GROUP
|
||||
10
|
||||
11
|
||||
12
|
||||
|
@ -1793,7 +1793,13 @@ void CAmbarCendamo::deh3m()
|
||||
{
|
||||
if(spec->buildingSettings[ir] & (1<<bs))
|
||||
{
|
||||
std::cout<<"Hej, sprawdz co to za budynek4 w miescie " <<nt<<std::endl;
|
||||
//horde building for 2lvl
|
||||
if(nt->builtBuildings.find(38)!=nt->builtBuildings.end())
|
||||
nt->builtBuildings.insert(19);
|
||||
else
|
||||
nt->builtBuildings.insert(18);
|
||||
|
||||
|
||||
}
|
||||
continue;
|
||||
}
|
||||
@ -1824,6 +1830,13 @@ void CAmbarCendamo::deh3m()
|
||||
nt->builtBuildings.insert(34);
|
||||
if(spec->buildingSettings[ir] & 1<<3)
|
||||
nt->builtBuildings.insert(41);
|
||||
if(spec->buildingSettings[ir] & 1<<3)
|
||||
{
|
||||
if(nt->builtBuildings.find(41)!=nt->builtBuildings.end())
|
||||
nt->builtBuildings.insert(25);
|
||||
else
|
||||
nt->builtBuildings.insert(24);
|
||||
}
|
||||
if(spec->buildingSettings[ir] & 1<<5)
|
||||
nt->builtBuildings.insert(35);
|
||||
if(spec->buildingSettings[ir] & 1<<6)
|
||||
|
Loading…
x
Reference in New Issue
Block a user