Attack notification

madmax · April 4, 2013

ok will switch to #include <boost/unordered_map.hpp>

madmax · April 4, 2013

done : https://github.com/laxmax/0ad/commit/5f22b02625bd8efe8ebe5072419c359aa809b4a1

zoot · April 4, 2013

So far so good, though now I get:

$ make -j9
==== Building mocks_real (release) ====
==== Building network (release) ====
==== Building simulation2 (release) ====
==== Building scriptinterface (release) ====
==== Building engine (release) ====
==== Building graphics (release) ====
==== Building atlas (release) ====
==== Building gui (release) ====
==== Building lowlevel (release) ====
==== Building mongoose (release) ====
==== Building mocks_test (release) ====
==== Building AtlasObject (release) ====
==== Building AtlasScript (release) ====
==== Building Collada (release) ====
==== Building AtlasUI (release) ====
MiniMap.cpp
CGUI.cpp
ScriptFunctions.cpp
==== Building ActorEditor (release) ====
../../../source/gui/scripting/ScriptFunctions.cpp:26:25: fatal error: gui/Minimap.h: No such file or directory
compilation terminated.
make[1]: *** [obj/gui_Release/ScriptFunctions.o] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [gui] Error 2

zoot · April 4, 2013

(I guess it needs to be "MiniMap" instead of "Minimap". Unix systems are case-sensitive.)

madmax · April 4, 2013

yeah stupid mistake that, wasnt caught on windows as its case insensitive. Should be #include "gui/MiniMap.h"

Committing.

OK, lets go again.

Edited April 4, 2013 by madmax

zoot · April 4, 2013

Great, it works now (y) I'll just grab something to eat, and then I'll have a look at it.

madmax · April 4, 2013

Should be like this :

OK, so I ll start adding the attacked sound to other unit templates. What are the units tests which need to be added or run after this change?

For the record, from this commit, https://github.com/l...ccefcab23ed206e

I was trying to make the following function inline :


void CMiniMap::AddPing(entity_id_t entityId) {
...
}

But I was getting a AddPing undefined reference error. It should be possible to hint to the compiler to make it inline like this :


inline void CMiniMap::AddPing(entity_id_t entityId) {
...
}

I also think this should be inlined :

float CMiniMap::GetAngle()

Does the compiler automatically do this for us without having to drop it any hints ?

Edited April 4, 2013 by madmax

madmax · April 4, 2013

Zoot, How were you able to pull your changes into your repo as it was changed in mine, I guess :unknw:

OK, so when I add a <attacked> sound to any unit template, I guess the simplest way to check if it works is to add the unit in Atlas and place a enemy unit in front and run the game for this Atlas map ?

Edited April 4, 2013 by madmax

zoot · April 4, 2013

Zoot, How were you able to pull your changes into your repo as it was changed in mine, I guess

I pull with "git pull". To temporarily test a given remote branch, I just use "git checkout".

madmax · April 4, 2013

Thanks.

Ok, I just opened Atlas and saved a blank map.

Then started in pyrogenesis and got a bunch of JS errors :


ERROR: JavaScript error: simulation/ai/qbot-wc/qbot.js line 68 TypeError: myKeyEntities.toEntityArray()[0] is undefined ([object Object],[object Object])@simulation/ai/qbot-wc/qbot.js:68 ([object Object],[object Object])@simulation/ai/common-api-v3/base.js:42 @:0
ERROR: JavaScript error: gui/session/session.js line 105 TypeError: Engine.GetSimRate is not a function init((void 0),(void 0))@gui/session/session.js:105
ERROR: GUI page 'page_session.xml': Failed to call init() function
ERROR: JavaScript error: gui/session/menu.js line 69 TypeError: menu is undefined updateMenuPosition(142)@gui/session/menu.js:69 onTick()@gui/session/session.js:287 __eventhandler0 (tick)([object Object])@sn tick:0
ERROR: JavaScript error: gui/session/menu.js line 69 TypeError: menu is undefined updateMenuPosition(46)@gui/session/menu.js:69 onTick()@gui/session/session.js:287 __eventhandler0 (tick)([object Object])@sn tick:0
ERROR: JavaScript error: gui/session/menu.js line 69 TypeError: menu is undefined updateMenuPosition(48)@gui/session/menu.js:69 onTick()@gui/session/session.js:287 __eventhandler0 (tick)([object Object])@sn tick:0
ERROR: JavaScript error: gui/session/menu.js line 69 TypeError: menu is undefined updateMenuPosition(3)@gui/session/menu.js:69 onTick()@gui/session/session.js:287 __eventhandler0 (tick)([object Object])@sn tick:0
ERROR: JavaScript error: gui/session/menu.js line 69 TypeError: menu is undefined updateMenuPosition(3)@gui/session/menu.js:69 onTick()@gui/session/session.js:287 __eventhandler0 (tick)([object Object])@sn tick:0
ERROR: JavaScript error: gui/session/menu.js line 69 TypeError: menu is undefined updateMenuPosition(4)@gui/session/menu.js:69 onTick()@gui/session/session.js:287 __eventhandler0 (tick)([object Object])@sn tick:0
ERROR: JavaScript error: gui/session/menu.js line 69 TypeError: menu is undefined updateMenuPosition(2)@gui/session/menu.js:69 onTick()@gui/session/session.js:287 __eventhandler0 (tick)([object Object])@sn tick:0
ERROR: JavaScript error: gui/session/menu.js line 69 TypeError: menu is undefined updateMenuPosition(3)@gui/session/menu.js:69 onTick()@gui/session/session.js:287 __eventhandler0 (tick)([object Object])@sn tick:0
ERROR: JavaScript error: gui/session/menu.js line 69 TypeError: menu is undefined updateMenuPosition(2)@gui/session/menu.js:69 onTick()@gui/session/session.js:287 __eventhandler0 (tick)([object Object])@sn tick:0
ERROR: JavaScript error: gui/session/menu.js line 69 TypeError: menu is undefined updateMenuPosition(3)@gui/session/menu.js:69 onTick()@gui/session/session.js:287 __eventhandler0 (tick)([object Object])@sn tick:0
ERROR: JavaScript error: gui/session/menu.js line 69 TypeError: menu is undefined updateMenuPosition(3)@gui/session/menu.js:69 onTick()@gui/session/session.js:287 __eventhandler0 (tick)([object Object])@sn tick:0
ERROR: JavaScript error: gui/session/menu.js line 69 TypeError: menu is undefined updateMenuPosition(2)@gui/session/menu.js:69 onTick()@gui/session/session.js:287 __eventhandler0 (tick)([object Object])@sn tick:0
ERROR: JavaScript error: gui/session/menu.js line 69 TypeError: menu is undefined updateMenuPosition(3)@gui/session/menu.js:69 onTick()@gui/session/session.js:287 __eventhandler0 (tick)([object Object])@sn tick:0
ERROR: JavaScript error: gui/session/menu.js line 69 TypeError: menu is undefined updateMenuPosition(2)@gui/session/menu.js:69 onTick()@gui/session/session.js:287 __eventhandler0 (tick)([object Object])@sn tick:0
ERROR: JavaScript error: gui/session/menu.js line 69 TypeError: menu is undefined updateMenuPosition(3)@gui/session/menu.js:69 onTick()@gui/session/session.js:287 __eventhandler0 (tick)([object Object])@sn tick:0
ERROR: JavaScript error: gui/session/menu.js line 69 TypeError: menu is undefined updateMenuPosition(2)@gui/session/menu.js:69 onTick()@gui/session/session.js:287 __eventhandler0 (tick)([object Object])@sn tick:0
ERROR: JavaScript error: gui/session/menu.js line 69 TypeError: menu is undefined updateMenuPosition(3)@gui/session/menu.js:69 onTick()@gui/session/session.js:287 __eventhandler0 (tick)([object Object])@sn tick:0
ERROR: JavaScript error: gui/session/menu.js line 69 TypeError: menu is undefined updateMenuPosition(3)@gui/session/menu.js:69 onTick()@gui/session/session.js:287 __eventhandler0 (tick)([object Object])@sn tick:0
ERROR: JavaScript error: gui/session/menu.js line 69 TypeError: menu is undefined updateMenuPosition(4)@gui/session/menu.js:69 onTick()@gui/session/session.js:287 __eventhandler0 (tick)([object Object])@sn tick:0
ERROR: JavaScript error: gui/session/menu.js line 69 TypeError: menu is undefined updateMenuPosition(2)@gui/session/menu.js:69 onTick()@gui/session/session.js:287 __eventhandler0 (tick)([object Object])@sn tick:0
ERROR: JavaScript error: gui/session/menu.js line 69 TypeError: menu is undefined updateMenuPosition(4)@gui/session/menu.js:69 onTick()@gui/session/session.js:287 __eventhandler0 (tick)([object Object])@sn tick:0
ERROR: JavaScript error: gui/session/menu.js line 69 TypeError: menu is undefined updateMenuPosition(4)@gui/session/menu.js:69 onTick()@gui/session/session.js:287 __eventhandler0 (tick)([object Object])@sn tick:0
ERROR: JavaScript error: gui/session/menu.js line 69 TypeError: menu is undefined updateMenuPosition(3)@gui/session/menu.js:69 onTick()@gui/session/session.js:287 __eventhandler0 (tick)([object Object])@sn tick:0
ERROR: JavaScript error: gui/session/menu.js line 69 TypeError: menu is undefined updateMenuPosition(2)@gui/session/menu.js:69 onTick()@gui/session/session.js:287 __eventhandler0 (tick)([object Object])@sn tick:0
ERROR: JavaScript error: gui/session/menu.js line 69 TypeError: menu is undefined updateMenuPosition(3)@gui/session/menu.js:69 onTick()@gui/session/session.js:287 __eventhandler0 (tick)([object Object])@sn tick:0
ERROR: JavaScript error: gui/session/menu.js line 69 TypeError: menu is undefined updateMenuPosition(2)@gui/session/menu.js:69 onTick()@gui/session/session.js:287 __eventhandler0 (tick)([object Object])@sn tick:0
ERROR: JavaScript error: gui/session/menu.js line 69 TypeError: menu is undefined updateMenuPosition(3)@gui/session/menu.js:69 onTick()@gui/session/session.js:287 __eventhandler0 (tick)([object Object])@sn tick:0
ERROR: JavaScript error: gui/session/menu.js line 69 TypeError: menu is undefined updateMenuPosition(2)@gui/session/menu.js:69 onTick()@gui/session/session.js:287 __eventhandler0 (tick)([object Object])@sn tick:0
ERROR: JavaScript error: gui/session/menu.js line 69 TypeError: menu is undefined updateMenuPosition(3)@gui/session/menu.js:69 onTick()@gui/session/session.js:287 __eventhandler0 (tick)([object Object])@sn tick:0
ERROR: JavaScript error: gui/session/menu.js line 69 TypeError: menu is undefined updateMenuPosition(3)@gui/session/menu.js:69 onTick()@gui/session/session.js:287 __eventhandler0 (tick)([object Object])@sn tick:0
ERROR: JavaScript error: gui/session/menu.js line 69 TypeError: menu is undefined updateMenuPosition(2)@gui/session/menu.js:69 onTick()@gui/session/session.js:287 __eventhandler0 (tick)([object Object])@sn tick:0
ERROR: JavaScript error: gui/session/menu.js line 69 TypeError: menu is undefined updateMenuPosition(3)@gui/session/menu.js:69 onTick()@gui/session/session.js:287 __eventhandler0 (tick)([object Object])@sn tick:0
ERROR: JavaScript error: gui/session/menu.js line 69 TypeError: menu is undefined updateMenuPosition(3)@gui/session/menu.js:69 onTick()@gui/session/session.js:287 __eventhandler0 (tick)([object Object])@sn tick:0
ERROR: JavaScript error: gui/session/menu.js line 69 TypeError: menu is undefined updateMenuPosition(2)@gui/session/menu.js:69 onTick()@gui/session/session.js:287 __eventhandler0 (tick)([object Object])@sn tick:0
ERROR: JavaScript error: gui/session/menu.js line 69 TypeError: menu is undefined updateMenuPosition(3)@gui/session/menu.js:69 onTick()@gui/session/session.js:287 __eventhandler0 (tick)([object Object])@sn tick:0
WARNING: JavaScript warning: simulation/ai/qbot-wc/qbot.js line 287 reference to undefined property this.pathInfo
ERROR: JavaScript error: simulation/ai/qbot-wc/qbot.js line 287 TypeError: this.pathInfo is undefined ()@simulation/ai/qbot-wc/qbot.js:287 ([object Object],[object Array])@simulation/ai/qbot-wc/qbot.js:90 ([object Object])@simulation/ai/qbot-wc/qbot.js:156 ([object Object],[object Object])@simulation/ai/common-api-v3/base.js:66 @:0
ERROR: JavaScript error: gui/session/menu.js line 69 TypeError: menu is undefined updateMenuPosition(10)@gui/session/menu.js:69 onTick()@gui/session/session.js:287 __eventhandler0 (tick)([object Object])@sn tick:0
ERROR: JavaScript error: gui/session/menu.js line 69 TypeError: menu is undefined updateMenuPosition(2)@gui/session/menu.js:69 onTick()@gui/session/session.js:287 __eventhandler0 (tick)([object Object])@sn tick:0
ERROR: JavaScript error: gui/session/menu.js line 69 TypeError: menu is undefined up

Should we be catching an empty map and exiting ?

Edited April 4, 2013 by madmax

madmax · April 4, 2013

Ok, this is very strange. I created a map by clicking the generate map button in atlas and that refuses to run in the game. I think the sim starts as I can see attacks happening and the minimap blinking where I expect, but the game world is not shown.

Does Atlas have any known bugs like this ?

zoot · April 4, 2013

Hmm. Seems you need to pull from the 0ad repo and rebuild. That "Engine.GetSimRate" function which is referenced in your error output was only committed yesterday. Somehow your JS and compiled source has come out of sync.

Edited April 4, 2013 by zoot

madmax · April 4, 2013

oh its not in SVN ?

zoot · April 4, 2013

Yes. Do you get the error on your fully updated SVN working copy?

madmax · April 4, 2013

Yeah I do

Is it possible to merge my current attack-notification branch with the master branch ...all in my local repo ?

That would also pull in the change I guess.

git pull master should do it ?

Edited April 4, 2013 by madmax

zoot · April 4, 2013

Assuming you mean the master branch on k776's repo, you need to add his repo as a remote first: https://help.github....adding-a-remote

Edited April 4, 2013 by zoot

madmax · April 4, 2013

ok and whats the next step after that

zoot · April 4, 2013

Assuming you mean the master branch on k776's repo, you need to add his repo as a remote first: https://help.github....adding-a-remote

So something like:

git remote add 0ad git://github.com/0ad/0ad.git

This would add k776's repo as a remote under the name '0ad'.

Then you should be able to do:

git pull 0ad master

to pull in the latest commits from his master branch.

madmax · April 4, 2013


abhi@ABHI-PC /f/Code/0ad/0ad (attack-notification)
$ git remote add k776-master https://github.com/0ad/0ad.git
abhi@ABHI-PC /f/Code/0ad/0ad (attack-notification)
$ git remote -v
k776-master	 https://github.com/0ad/0ad.git (fetch)
k776-master	 https://github.com/0ad/0ad.git (push)
origin  https://github.com/laxmax/0ad.git (fetch)
origin  https://github.com/laxmax/0ad.git (push)
abhi@ABHI-PC /f/Code/0ad/0ad (attack-notification)
$

oh ok, just read your post. So ok it looks similar. Now for the pulling part. If I pull his changes in, then it will merge into my current branch(attack-notification) automatically keeping all my changes in Minimap.cpp etc ?

Edited April 4, 2013 by madmax

zoot · April 4, 2013

It will, yes.

madmax · April 4, 2013

oh oh..it was there in SVN. Hadnt rebuilt the code. Ok back to templates...

madmax · April 4, 2013

I am looking at a particular unit in atlas : units/maur_hero_ashoka

How do I find which template I have to modify to add the attack sound to it ?

**alpha123** · April 4, 2013

binaries/data/mods/public/simulation/templates/units/maur_hero_ashoka.xml

The Atlas paths are just the template paths without the binaries/data/mods/public/simulation/templates/ prefix.

madmax · April 4, 2013

Ok and there is no <SoundGroup> in templates/units/maur_hero_ashoka.xml

But I see an

So I could add the sound group to the parent as well, and it would be pulled into the child I guess ?

madmax · April 4, 2013

Yep it was. Added to template_unit_champion_cavalry_javelinist

This is AWESOME !!!

Attack notification

Recommended Posts

Link to comment

Share on other sites

Top Posters In This Topic

Popular Days

Top Posters In This Topic

Popular Days

Popular Posts

zoot

Mythos_Ruler

zoot

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Link to comment

Share on other sites

Join the conversation