mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-08 21:54:58 +00:00
Merge branch 'master' into dev
This commit is contained in:
@@ -160,7 +160,7 @@ class PokeBattle_Scene
|
|||||||
trainer = pbAddSprite("player_#{idxTrainer+1}",spriteX,spriteY,trainerFile,@viewport)
|
trainer = pbAddSprite("player_#{idxTrainer+1}",spriteX,spriteY,trainerFile,@viewport)
|
||||||
return if !trainer.bitmap
|
return if !trainer.bitmap
|
||||||
# Alter position of sprite
|
# Alter position of sprite
|
||||||
trainer.z = 30+idxTrainer
|
trainer.z = 80+idxTrainer
|
||||||
if trainer.bitmap.width>trainer.bitmap.height*2
|
if trainer.bitmap.width>trainer.bitmap.height*2
|
||||||
trainer.src_rect.x = 0
|
trainer.src_rect.x = 0
|
||||||
trainer.src_rect.width = trainer.bitmap.width/5
|
trainer.src_rect.width = trainer.bitmap.width/5
|
||||||
|
|||||||
Reference in New Issue
Block a user