Jump to content

Attack notification


Recommended Posts

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

Link to comment
Share on other sites

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 by madmax
Link to comment
Share on other sites

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 by madmax
Link to comment
Share on other sites

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 by madmax
Link to comment
Share on other sites

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 ?

Link to comment
Share on other sites

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.

Link to comment
Share on other sites


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 by madmax
Link to comment
Share on other sites

Join the conversation

You can post now and register later. If you have an account, sign in now to post with your account.

Guest
Reply to this topic...

×   Pasted as rich text.   Paste as plain text instead

  Only 75 emoji are allowed.

×   Your link has been automatically embedded.   Display as a link instead

×   Your previous content has been restored.   Clear editor

×   You cannot paste images directly. Upload or insert images from URL.

 Share

×
×
  • Create New...