diff --git a/data/rooms/10.txt b/data/rooms/10.txt index 6e306ab..b83bfdc 100644 --- a/data/rooms/10.txt +++ b/data/rooms/10.txt @@ -143,7 +143,7 @@ actor{ bmp: caixes.gif bmp-rect: 160 0 32 32 bmp-offset: 0 34 - pos: 24 0 0 + pos: 48 0 0 size: 8 8 2 orient: XN flags: REACTIVE MOVING DEADLY diff --git a/data/rooms/26.txt b/data/rooms/26.txt index 2fc3a11..dd55014 100644 --- a/data/rooms/26.txt +++ b/data/rooms/26.txt @@ -1,11 +1,13 @@ width: 3 height: 2 +door-height-yp: 0 door-height-yn: 0 color: CYAN floor-texture: 10 wall-texture: 1 door-texture: 0 under-door-texture: 0 +exit-yp: 50 exit-yn: 24 actor{ diff --git a/data/rooms/46.txt b/data/rooms/46.txt index 74d93d5..fcecca7 100644 --- a/data/rooms/46.txt +++ b/data/rooms/46.txt @@ -1,8 +1,14 @@ width: 2 height: 2 +door-height-xp: 0 +door-height-xn: 0 +door-height-yp: 0 color: CYAN floor-texture: 0 wall-texture: 0 door-texture: 0 under-door-texture: 0 +exit-xp: 49 +exit-xn: 56 +exit-yp: 55 exit-zp: 44 diff --git a/data/rooms/47.txt b/data/rooms/47.txt index 7486e84..9199575 100644 --- a/data/rooms/47.txt +++ b/data/rooms/47.txt @@ -1,8 +1,337 @@ width: 3 height: 3 +door-height-xp: 1 +door-height-yp: 1 +door-height-yn: 1 color: CYAN floor-texture: 0 wall-texture: 0 door-texture: 0 under-door-texture: 0 +exit-xp: 50 +exit-yp: 49 +exit-yn: 48 exit-zp: 43 +exit-zn: 51 + +actor{ + name: BATMAN + bmp: batman.gif + bmp-rect: 0 0 21 32 + bmp-offset: -5 35 + pos: 0 24 4 + size: 8 8 8 + orient: YN + anim-wait: 1 + flags: REACTIVE MOVING ANIMATED ORIENTABLE DEADLY + react-mask: XP XN YP YN ZP ZN + movement: CCW +} + +actor{ + name: PLATH-00 + bmp: caixes.gif + bmp-rect: 160 128 32 32 + bmp-offset: 0 32 + pos: 32 0 0 + size: 8 8 4 + orient: ZP + movement: Z +} + +actor{ + name: PLATH-01 + bmp: caixes.gif + bmp-rect: 160 128 32 32 + bmp-offset: 0 32 + pos: 24 0 0 + size: 8 8 4 + orient: ZP + movement: Z +} + +actor{ + name: PLATH-02 + bmp: caixes.gif + bmp-rect: 160 128 32 32 + bmp-offset: 0 32 + pos: 40 0 0 + size: 8 8 4 + orient: ZP + movement: Z +} + +actor{ + name: PLATH-03 + bmp: caixes.gif + bmp-rect: 160 128 32 32 + bmp-offset: 0 32 + pos: 48 0 0 + size: 8 8 4 + orient: ZP + movement: Z +} + +actor{ + name: PLATH-04 + bmp: caixes.gif + bmp-rect: 160 128 32 32 + bmp-offset: 0 32 + pos: 56 0 0 + size: 8 8 4 + orient: ZP + movement: Z +} + +actor{ + name: PLATH-05 + bmp: caixes.gif + bmp-rect: 160 128 32 32 + bmp-offset: 0 32 + pos: 56 8 0 + size: 8 8 4 + orient: ZP + movement: Z +} + +actor{ + name: PLATH-06 + bmp: caixes.gif + bmp-rect: 160 128 32 32 + bmp-offset: 0 32 + pos: 56 16 0 + size: 8 8 4 + orient: ZP + movement: Z +} + +actor{ + name: PLATH-07 + bmp: caixes.gif + bmp-rect: 160 128 32 32 + bmp-offset: 0 32 + pos: 56 24 0 + size: 8 8 4 + orient: ZP + movement: Z +} + +actor{ + name: PLATH-08 + bmp: caixes.gif + bmp-rect: 160 128 32 32 + bmp-offset: 0 32 + pos: 56 32 0 + size: 8 8 4 + orient: ZP + movement: Z +} + +actor{ + name: PLATH-09 + bmp: caixes.gif + bmp-rect: 160 128 32 32 + bmp-offset: 0 32 + pos: 56 40 0 + size: 8 8 4 + orient: ZP + movement: Z +} + +actor{ + name: PLATH-10 + bmp: caixes.gif + bmp-rect: 160 128 32 32 + bmp-offset: 0 32 + pos: 56 48 0 + size: 8 8 4 + orient: ZP + movement: Z +} + +actor{ + name: PLATH-11 + bmp: caixes.gif + bmp-rect: 160 128 32 32 + bmp-offset: 0 32 + pos: 56 56 0 + size: 8 8 4 + orient: ZP + movement: Z +} + +actor{ + name: PLATH-12 + bmp: caixes.gif + bmp-rect: 160 128 32 32 + bmp-offset: 0 32 + pos: 48 56 0 + size: 8 8 4 + orient: ZP + movement: Z +} + +actor{ + name: PLATH-13 + bmp: caixes.gif + bmp-rect: 160 128 32 32 + bmp-offset: 0 32 + pos: 40 56 0 + size: 8 8 4 + orient: ZP + movement: Z +} + +actor{ + name: PLATH-14 + bmp: caixes.gif + bmp-rect: 160 128 32 32 + bmp-offset: 0 32 + pos: 32 56 0 + size: 8 8 4 + orient: ZP + movement: Z +} + +actor{ + name: PLATH-15 + bmp: caixes.gif + bmp-rect: 160 128 32 32 + bmp-offset: 0 32 + pos: 24 56 0 + size: 8 8 4 + orient: ZP + movement: Z +} + +actor{ + name: PLATH-16 + bmp: caixes.gif + bmp-rect: 160 128 32 32 + bmp-offset: 0 32 + pos: 16 56 0 + size: 8 8 4 + orient: ZP + movement: Z +} + +actor{ + name: PLATH-17 + bmp: caixes.gif + bmp-rect: 160 128 32 32 + bmp-offset: 0 32 + pos: 8 56 0 + size: 8 8 4 + orient: ZP + movement: Z +} + +actor{ + name: PLATH-18 + bmp: caixes.gif + bmp-rect: 160 128 32 32 + bmp-offset: 0 32 + pos: 0 56 0 + size: 8 8 4 + orient: ZP + movement: Z +} + +actor{ + name: PLATH-19 + bmp: caixes.gif + bmp-rect: 160 128 32 32 + bmp-offset: 0 32 + pos: 0 48 0 + size: 8 8 4 + orient: ZP + movement: Z +} + +actor{ + name: PLATH-20 + bmp: caixes.gif + bmp-rect: 160 128 32 32 + bmp-offset: 0 32 + pos: 0 40 0 + size: 8 8 4 + orient: ZP + movement: Z +} + +actor{ + name: PLATH-21 + bmp: caixes.gif + bmp-rect: 160 128 32 32 + bmp-offset: 0 32 + pos: 0 32 0 + size: 8 8 4 + orient: ZP + movement: Z +} + +actor{ + name: PLATH-22 + bmp: caixes.gif + bmp-rect: 160 128 32 32 + bmp-offset: 0 32 + pos: 0 24 0 + size: 8 8 4 + orient: ZP + movement: Z +} + +actor{ + name: PLATH-23 + bmp: caixes.gif + bmp-rect: 160 128 32 32 + bmp-offset: 0 32 + pos: 0 16 0 + size: 8 8 4 + orient: ZP + movement: Z +} + +actor{ + name: PLATH-24 + bmp: caixes.gif + bmp-rect: 160 128 32 32 + bmp-offset: 0 32 + pos: 0 8 0 + size: 8 8 4 + orient: ZP + movement: Z +} + +actor{ + name: PLATH-25 + bmp: caixes.gif + bmp-rect: 160 128 32 32 + bmp-offset: 0 32 + pos: 0 0 0 + size: 8 8 4 + orient: ZP + movement: Z +} + +actor{ + name: PLATH-26 + bmp: caixes.gif + bmp-rect: 160 128 32 32 + bmp-offset: 0 32 + pos: 8 0 0 + size: 8 8 4 + orient: ZP + movement: Z +} + +actor{ + name: PLATH-27 + bmp: caixes.gif + bmp-rect: 160 128 32 32 + bmp-offset: 0 32 + pos: 16 0 0 + size: 8 8 4 + orient: ZP + movement: Z +} diff --git a/data/rooms/48.txt b/data/rooms/48.txt new file mode 100644 index 0000000..e11bd20 --- /dev/null +++ b/data/rooms/48.txt @@ -0,0 +1,9 @@ +width: 2 +height: 2 +door-height-yp: 0 +color: CYAN +floor-texture: 0 +wall-texture: 0 +door-texture: 0 +under-door-texture: 0 +exit-yp: 47 diff --git a/data/rooms/49.txt b/data/rooms/49.txt new file mode 100644 index 0000000..02a39b8 --- /dev/null +++ b/data/rooms/49.txt @@ -0,0 +1,11 @@ +width: 2 +height: 2 +door-height-xn: 0 +door-height-yn: 0 +color: CYAN +floor-texture: 0 +wall-texture: 0 +door-texture: 0 +under-door-texture: 0 +exit-xn: 46 +exit-yn: 47 diff --git a/data/rooms/50.txt b/data/rooms/50.txt new file mode 100644 index 0000000..c35acc2 --- /dev/null +++ b/data/rooms/50.txt @@ -0,0 +1,11 @@ +width: 2 +height: 2 +door-height-xn: 0 +door-height-yn: 0 +color: CYAN +floor-texture: 0 +wall-texture: 0 +door-texture: 0 +under-door-texture: 0 +exit-xn: 47 +exit-yn: 26 diff --git a/data/rooms/51.txt b/data/rooms/51.txt new file mode 100644 index 0000000..a371a04 --- /dev/null +++ b/data/rooms/51.txt @@ -0,0 +1,10 @@ +width: 3 +height: 3 +door-height-yp: 0 +color: CYAN +floor-texture: 0 +wall-texture: 0 +door-texture: 0 +under-door-texture: 0 +exit-yp: 52 +exit-zp: 47 diff --git a/data/rooms/52.txt b/data/rooms/52.txt new file mode 100644 index 0000000..d4afb59 --- /dev/null +++ b/data/rooms/52.txt @@ -0,0 +1,11 @@ +width: 2 +height: 2 +door-height-xn: 0 +door-height-yn: 0 +color: CYAN +floor-texture: 0 +wall-texture: 0 +door-texture: 0 +under-door-texture: 0 +exit-xn: 53 +exit-yn: 51 diff --git a/data/rooms/53.txt b/data/rooms/53.txt new file mode 100644 index 0000000..b8ad7ea --- /dev/null +++ b/data/rooms/53.txt @@ -0,0 +1,11 @@ +width: 2 +height: 2 +door-height-xp: 0 +door-height-yp: 0 +color: CYAN +floor-texture: 0 +wall-texture: 0 +door-texture: 0 +under-door-texture: 0 +exit-xp: 52 +exit-yp: 54 diff --git a/data/rooms/54.txt b/data/rooms/54.txt new file mode 100644 index 0000000..a4521c5 --- /dev/null +++ b/data/rooms/54.txt @@ -0,0 +1,10 @@ +width: 2 +height: 2 +door-height-yn: 0 +color: CYAN +floor-texture: 0 +wall-texture: 0 +door-texture: 0 +under-door-texture: 0 +exit-yn: 53 +exit-zp: 55 diff --git a/data/rooms/55.txt b/data/rooms/55.txt new file mode 100644 index 0000000..b0e6354 --- /dev/null +++ b/data/rooms/55.txt @@ -0,0 +1,10 @@ +width: 2 +height: 2 +door-height-yn: 0 +color: CYAN +floor-texture: 0 +wall-texture: 0 +door-texture: 0 +under-door-texture: 0 +exit-yn: 46 +exit-zn: 54 diff --git a/data/rooms/56.txt b/data/rooms/56.txt new file mode 100644 index 0000000..a81917c --- /dev/null +++ b/data/rooms/56.txt @@ -0,0 +1,11 @@ +width: 2 +height: 2 +door-height-xp: 0 +door-height-yp: 0 +color: CYAN +floor-texture: 0 +wall-texture: 0 +door-texture: 0 +under-door-texture: 0 +exit-xp: 46 +exit-yp: 57 diff --git a/data/rooms/57.txt b/data/rooms/57.txt new file mode 100644 index 0000000..5f16c66 --- /dev/null +++ b/data/rooms/57.txt @@ -0,0 +1,11 @@ +width: 2 +height: 2 +door-height-xn: 0 +door-height-yn: 0 +color: CYAN +floor-texture: 0 +wall-texture: 0 +door-texture: 0 +under-door-texture: 0 +exit-xn: 58 +exit-yn: 56 diff --git a/data/rooms/58.txt b/data/rooms/58.txt new file mode 100644 index 0000000..c09c883 --- /dev/null +++ b/data/rooms/58.txt @@ -0,0 +1,11 @@ +width: 2 +height: 2 +door-height-xp: 0 +door-height-xn: 0 +color: CYAN +floor-texture: 0 +wall-texture: 0 +door-texture: 0 +under-door-texture: 0 +exit-xp: 57 +exit-xn: 59 diff --git a/data/rooms/59.txt b/data/rooms/59.txt new file mode 100644 index 0000000..f5db7b9 --- /dev/null +++ b/data/rooms/59.txt @@ -0,0 +1,15 @@ +width: 2 +height: 2 +door-height-xp: 0 +door-height-xn: 0 +door-height-yp: 0 +door-height-yn: 0 +color: CYAN +floor-texture: 0 +wall-texture: 0 +door-texture: 0 +under-door-texture: 0 +exit-xp: 58 +exit-xn: 61 +exit-yp: 60 +exit-yn: 62 diff --git a/data/rooms/60.txt b/data/rooms/60.txt new file mode 100644 index 0000000..0e5a53a --- /dev/null +++ b/data/rooms/60.txt @@ -0,0 +1,9 @@ +width: 2 +height: 2 +door-height-yn: 0 +color: CYAN +floor-texture: 0 +wall-texture: 0 +door-texture: 0 +under-door-texture: 0 +exit-yn: 59 diff --git a/data/rooms/61.txt b/data/rooms/61.txt new file mode 100644 index 0000000..cfd4d69 --- /dev/null +++ b/data/rooms/61.txt @@ -0,0 +1,9 @@ +width: 2 +height: 2 +door-height-xp: 0 +color: CYAN +floor-texture: 0 +wall-texture: 0 +door-texture: 0 +under-door-texture: 0 +exit-xp: 59 diff --git a/data/rooms/62.txt b/data/rooms/62.txt new file mode 100644 index 0000000..eb41e10 --- /dev/null +++ b/data/rooms/62.txt @@ -0,0 +1,11 @@ +width: 2 +height: 2 +door-height-xn: 0 +door-height-yp: 0 +color: CYAN +floor-texture: 0 +wall-texture: 0 +door-texture: 0 +under-door-texture: 0 +exit-xn: 63 +exit-yp: 59 diff --git a/data/rooms/63.txt b/data/rooms/63.txt new file mode 100644 index 0000000..072f3c2 --- /dev/null +++ b/data/rooms/63.txt @@ -0,0 +1,9 @@ +width: 2 +height: 2 +door-height-xp: 0 +color: CYAN +floor-texture: 0 +wall-texture: 0 +door-texture: 0 +under-door-texture: 0 +exit-xp: 62 diff --git a/source/m_editor_map.cpp b/source/m_editor_map.cpp index df6d4ec..9ffb15c 100644 --- a/source/m_editor_map.cpp +++ b/source/m_editor_map.cpp @@ -125,7 +125,7 @@ namespace modules current_room = room::getCurrent(); loadMiniRoom(); - room::load(current_room); + room::load(42); for (int i=0;i<64;++i) drawn[i]=false; draw::cls(2);