Skip to content

Commit 09aaecb

Browse files
committed
mp tests fix
1 parent 0ca9150 commit 09aaecb

4 files changed

Lines changed: 48 additions & 3 deletions

File tree

data/schema/core/actionwml.cfg

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1453,5 +1453,40 @@
14531453
{SIMPLE_KEY y s_unsigned}
14541454
[/tag]
14551455
[/tag]
1456-
any_tag=yes
1456+
# custom mainline campaign tags
1457+
# EI
1458+
{DATA_TAG "item_dialog" 0 infinite any}
1459+
{DATA_TAG "item_dialog_musttake" 0 infinite any}
1460+
# HttT
1461+
{DATA_TAG "companion_message" 0 infinite any} # also used in TSG
1462+
{DATA_TAG "multihex_image" 0 infinite any}
1463+
{DATA_TAG "select_lintanir_boon" 0 infinite any}
1464+
{DATA_TAG "display_scenario_preview" 0 infinite any}
1465+
{DATA_TAG "display_overworld_tutorial" 0 infinite any}
1466+
{DATA_TAG "display_lisar_tutorial" 0 infinite any}
1467+
# HttTC
1468+
{DATA_TAG "show_countdown" 0 infinite any}
1469+
# LoW
1470+
{DATA_TAG "replace_map_section" 0 infinite any}
1471+
{DATA_TAG "shift_labels" 0 infinite any}
1472+
{DATA_TAG "persistent_carryover_store" 0 infinite any}
1473+
# NR
1474+
{DATA_TAG "find_respawn_point" 0 infinite any}
1475+
# SoF
1476+
{DATA_TAG "rune_choice" 0 infinite any}
1477+
# TDG
1478+
{DATA_TAG "listen_for_mousemove" 0 infinite any}
1479+
{DATA_TAG "select_delfador_skills" 0 infinite any}
1480+
{DATA_TAG "display_skills_dialog" 0 infinite any}
1481+
# TSG
1482+
{DATA_TAG "display_tip" 0 infinite any}
1483+
{DATA_TAG "choose_companion" 0 infinite any}
1484+
# tutorial
1485+
{DATA_TAG "select_character" 0 infinite any}
1486+
{DATA_TAG "hint_message" 0 infinite any}
1487+
# tests
1488+
{DATA_TAG "foo" 0 infinite any}
1489+
{DATA_TAG "test_do_attack_by_id" 0 infinite any}
1490+
{DATA_TAG "my_lua_action" 0 infinite any}
1491+
{DATA_TAG "check_substitution" 0 infinite any}
14571492
[/tag]

data/schema/core/conditionalwml.cfg

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,5 +85,6 @@
8585
name="not"
8686
super="$conditional_wml"
8787
[/tag]
88-
any_tag=yes
88+
# tests
89+
{DATA_TAG "foo" 0 infinite any}
8990
[/tag]

data/schema/languages.cfg

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,12 @@
1919
max=infinite
2020
{REQUIRED_KEY name string}
2121
{REQUIRED_KEY locale locale}
22+
{SIMPLE_KEY windows_locale string}
2223
{REQUIRED_KEY percent unsigned}
2324
{DEFAULT_KEY dir textdir ltr}
2425
{SIMPLE_KEY sort_name string}
2526
{SIMPLE_KEY alternates locale_list}
27+
{SIMPLE_KEY windows_alternates string}
2628
[/tag]
2729
[/tag]
2830
[/wml_schema]

src/video.cpp

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -684,7 +684,14 @@ SDL_Renderer* get_renderer()
684684

685685
SDL_Window* get_window()
686686
{
687-
return *window;
687+
if(window)
688+
{
689+
return *window;
690+
}
691+
else
692+
{
693+
return nullptr;
694+
}
688695
}
689696

690697
std::string current_driver()

0 commit comments

Comments
 (0)