Loads of work to replace panics with results.
Some checks failed
continuous-integration/drone/push Build is failing
Some checks failed
continuous-integration/drone/push Build is failing
This commit is contained in:
@@ -40,7 +40,7 @@ register! {
|
||||
env: FunctionEnvMut<WebAssemblyEnv>,
|
||||
side: ExternRef<BattleSide>,
|
||||
) -> ExternRef<Battle> {
|
||||
ExternRef::func_new(&env, side.value_func(&env).unwrap().battle())
|
||||
ExternRef::func_new(&env, side.value_func(&env).unwrap().battle().unwrap())
|
||||
}
|
||||
|
||||
fn battleside_get_pokemon(
|
||||
|
||||
@@ -36,7 +36,7 @@ register! {
|
||||
turn_choice: ExternRef<LearnedMove>,
|
||||
amount: u8,
|
||||
) {
|
||||
turn_choice.value_func(&env).unwrap().restore_uses(amount);
|
||||
turn_choice.value_func(&env).unwrap().restore_uses(amount).unwrap();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -135,7 +135,7 @@ register! {
|
||||
self_inflicted: u8
|
||||
) -> u8 {
|
||||
unsafe{
|
||||
u8::from(pokemon.value_func(&env).unwrap().change_stat_boost(transmute(stat), amount, self_inflicted == 1))
|
||||
u8::from(pokemon.value_func(&env).unwrap().change_stat_boost(transmute(stat), amount, self_inflicted == 1).unwrap())
|
||||
}
|
||||
}
|
||||
|
||||
@@ -277,7 +277,7 @@ register! {
|
||||
env: FunctionEnvMut<WebAssemblyEnv>,
|
||||
pokemon: ExternRef<Pokemon>,
|
||||
) -> u8 {
|
||||
if pokemon.value_func(&env).unwrap().consume_held_item() { 1 } else { 0 }
|
||||
if pokemon.value_func(&env).unwrap().consume_held_item().unwrap() { 1 } else { 0 }
|
||||
}
|
||||
|
||||
fn pokemon_get_types_length(
|
||||
@@ -312,7 +312,7 @@ register! {
|
||||
pokemon.value_func(&env).unwrap().change_species(
|
||||
species.value_func_arc(&env).unwrap(),
|
||||
form.value_func_arc(&env).unwrap(),
|
||||
);
|
||||
).unwrap();
|
||||
}
|
||||
|
||||
fn pokemon_change_form(
|
||||
@@ -322,7 +322,7 @@ register! {
|
||||
) {
|
||||
pokemon.value_func(&env).unwrap().change_form(
|
||||
&form.value_func_arc(&env).unwrap(),
|
||||
);
|
||||
).unwrap();
|
||||
}
|
||||
|
||||
fn pokemon_get_current_health(
|
||||
|
||||
Reference in New Issue
Block a user