Skip to content

Commit dbdbf3a

Browse files
committed
add scenery
1 parent f21f55d commit dbdbf3a

8 files changed

Lines changed: 11 additions & 0 deletions

File tree

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88
<br><br>
99
</div>
1010

11+
<img src="https://github.com/tvdboom/tinywar/blob/master/assets/images/bg/scenery1.png?raw=true" alt="scenery1">
12+
<img src="https://github.com/tvdboom/tinywar/blob/master/assets/images/bg/scenery2.png?raw=true" alt="scenery2">
13+
<img src="https://github.com/tvdboom/tinywar/blob/master/assets/images/bg/scenery3.png?raw=true" alt="scenery3">
14+
<img src="https://github.com/tvdboom/tinywar/blob/master/assets/images/bg/scenery4.png?raw=true" alt="scenery4">
1115

1216
<br>
1317

assets/images/bg/scenery1.png

491 KB
Loading

assets/images/bg/scenery2.png

263 KB
Loading

assets/images/bg/scenery3.png

1.13 MB
Loading

assets/images/bg/scenery4.png

1.11 MB
Loading

src/core/map/ui/systems.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -855,6 +855,8 @@ pub fn draw_ui(
855855
ImageNode::new(assets.image("banner")),
856856
GlobalZIndex(10),
857857
UnitInfoPanelCmp,
858+
UiCmp,
859+
MapCmp,
858860
))
859861
.with_children(|parent| {
860862
parent

src/core/menu/systems.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
use std::net::IpAddr;
22

33
use bevy::prelude::*;
4+
use bevy_renet::netcode::NetcodeClientTransport;
45
#[cfg(not(target_arch = "wasm32"))]
56
use {
67
crate::core::network::local_ip,
@@ -340,6 +341,7 @@ pub fn exit_multiplayer_lobby(
340341
if let Some(client) = client.as_mut() {
341342
client.disconnect();
342343
commands.remove_resource::<RenetClient>();
344+
commands.remove_resource::<NetcodeClientTransport>();
343345
println!("Client removed.");
344346
} else if let Some(mut server) = server {
345347
server.disconnect_all();

src/core/network.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ use bevy_renet::*;
2020
use bincode::config::standard;
2121
use bincode::serde::{decode_from_slice, encode_to_vec};
2222
use serde::{Deserialize, Serialize};
23+
use crate::core::menu::systems::Host;
2324

2425
const PROTOCOL_ID: u64 = 7;
2526

@@ -301,10 +302,12 @@ pub fn client_receive_message(
301302
player,
302303
enemy_color,
303304
} => {
305+
settings.reset();
304306
settings.game_mode = GameMode::Multiplayer;
305307
settings.color = player.color;
306308
settings.enemy_color = enemy_color;
307309

310+
commands.remove_resource::<Host>();
308311
commands.insert_resource(EntityMap::default());
309312
commands.insert_resource(AfterBoostCount::default());
310313
commands.insert_resource(Players {

0 commit comments

Comments
 (0)