Commit 7b851654 authored by mercury233's avatar mercury233
parents 061895d0 e86c0b0b
...@@ -91,6 +91,7 @@ void ClientField::Initial(int player, int deckc, int extrac) { ...@@ -91,6 +91,7 @@ void ClientField::Initial(int player, int deckc, int extrac) {
pcard->controler = player; pcard->controler = player;
pcard->location = 0x1; pcard->location = 0x1;
pcard->sequence = i; pcard->sequence = i;
pcard->position = POS_FACEDOWN_DEFENSE;
GetCardLocation(pcard, &pcard->curPos, &pcard->curRot); GetCardLocation(pcard, &pcard->curPos, &pcard->curRot);
pcard->mTransform.setTranslation(pcard->curPos); pcard->mTransform.setTranslation(pcard->curPos);
pcard->mTransform.setRotationRadians(pcard->curRot); pcard->mTransform.setRotationRadians(pcard->curRot);
......
...@@ -940,7 +940,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) { ...@@ -940,7 +940,7 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
// color // color
if(conti_selecting) if(conti_selecting)
mainGame->stCardPos[i]->setBackgroundColor(0xffffffff); mainGame->stCardPos[i]->setBackgroundColor(0xffffffff);
if(selectable_cards[i + pos]->location == LOCATION_OVERLAY) { else if(selectable_cards[i + pos]->location == LOCATION_OVERLAY) {
if(selectable_cards[i + pos]->owner != selectable_cards[i + pos]->overlayTarget->controler) if(selectable_cards[i + pos]->owner != selectable_cards[i + pos]->overlayTarget->controler)
mainGame->stCardPos[i]->setOverrideColor(0xff0000ff); mainGame->stCardPos[i]->setOverrideColor(0xff0000ff);
if(selectable_cards[i + pos]->is_selected) if(selectable_cards[i + pos]->is_selected)
......
...@@ -46,6 +46,8 @@ bool Game::Initialize() { ...@@ -46,6 +46,8 @@ bool Game::Initialize() {
is_building = false; is_building = false;
memset(&dInfo, 0, sizeof(DuelInfo)); memset(&dInfo, 0, sizeof(DuelInfo));
memset(chatTiming, 0, sizeof(chatTiming)); memset(chatTiming, 0, sizeof(chatTiming));
for(int i = 0; i < 2048; ++i)
dataManager._sysStrings[i] = 0;
deckManager.LoadLFList(); deckManager.LoadLFList();
driver = device->getVideoDriver(); driver = device->getVideoDriver();
driver->setTextureCreationFlag(irr::video::ETCF_CREATE_MIP_MAPS, false); driver->setTextureCreationFlag(irr::video::ETCF_CREATE_MIP_MAPS, false);
......
Subproject commit 6747080c00ee6c9d1474a23a0559f939dbe47983 Subproject commit ec988120c898df5984f08da1536c6b1cb1998127
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment