From e935abb56d4c8a5d5bdbd1ac603e5cb4954ad524 Mon Sep 17 00:00:00 2001 From: gerstrong Date: Mon, 10 Aug 2009 19:06:58 +0000 Subject: [PATCH] fixed Vorticon Elite shot position git-svn-id: https://clonekeenplus.svn.sourceforge.net/svnroot/clonekeenplus/cgenius/trunk@221 4df4b0f3-56ce-47cb-b001-ed939b7d65a6 --- future.txt | 2 +- src/ai/ray.cpp | 9 ++++++--- src/ai/vortelite.cpp | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/future.txt b/future.txt index 8e2bb852a..cf1cba0be 100644 --- a/future.txt +++ b/future.txt @@ -2,9 +2,9 @@ Here are the features that I still want to implement: ----------------------------------------------------- until 0.4: -- Read all the text out of EXE-files. This should provide better support for mods! - F1 Help screen would be nice - Update the Dialog Class. It should support more controls, and be easier to manage +- Read all the text out of EXE-files. This should provide better support for mods! - New Games Menu. Should run without the need of an episode! - Improve the logic of Keen.exe reading for a better mod compatibility - Implement a better Audio Controls. Volume, mute, etc. diff --git a/src/ai/ray.cpp b/src/ai/ray.cpp index c21d952eb..6c2a25244 100644 --- a/src/ai/ray.cpp +++ b/src/ai/ray.cpp @@ -22,10 +22,13 @@ int hitlethal; if (objects[o].ai.ray.direction==RIGHT && objects[o].blockedr) { objects[o].x = (objects[o].x >> 4 >> CSF) << 4 << CSF; - if (TileProperty[getmaptileat(objects[o].x>>CSF,objects[o].y>>CSF)][BLEFT]) objects[o].x -= (16<>CSF,objects[o].y>>CSF)].solidl) objects[o].x -= (16<>CSF,objects[o].y>>CSF)][BLEFT]) + objects[o].x -= (16<playStereofromCoord(SOUND_SHOT_HIT, PLAY_NOW, objects[o].scrx); + + if (objects[o].onscreen) + g_pSound->playStereofromCoord(SOUND_SHOT_HIT, PLAY_NOW, objects[o].scrx); } else if (objects[o].ai.ray.direction==LEFT && objects[o].blockedl) { diff --git a/src/ai/vortelite.cpp b/src/ai/vortelite.cpp index 11e267fae..ce0e37df0 100644 --- a/src/ai/vortelite.cpp +++ b/src/ai/vortelite.cpp @@ -231,7 +231,7 @@ reprocess: ; objects[o].ai.vortelite.state = VORTELITE_FIRED; if (objects[o].ai.vortelite.movedir==RIGHT) { - newobject = spawn_object(objects[o].x+(sprites[VORTELITE_FIRE_RIGHT_FRAME].xsize<