Barony next user data #86

lheckemann · 2017-06-13T17:31:46Z

Same as #85 but for barony-next, I've resolved all the conflicts.

addictgamer · 2017-07-03T19:32:20Z

I tried merging, but I got errors:

/home/ciprian/programming/turning_wheel/barony_opensource/src/main.hpp:524:1: error: ‘light_t’ does not name a type

It looks like somebody changed the parameters lists for generatePolyModels and generateVBOs
Not sure what to do about the files.cpp conflict, inside of the saveMap function.

Also, shouldn't the header files have a header?

Also also, I noticed multiple violations of the coding style guidelines, such as:

void setUserDir(const char * const dir) {
//Curly brace not on proceeding line

and

if (mkdir(path, 0700) != 0 && errno != EEXIST)
		return errno;
//Lack of curly brace, and no inner padding on inside of outermost parentheses

lheckemann · 2017-07-03T21:19:21Z

I'll take a look at it this weekend hopefully.

addictgamer · 2017-07-04T10:45:46Z

Ok.

I think I'm going to put off merging the PR until I can test it on a Mac again, when I get back home in August.

Since they are inlined, their implementation needs to be included in every source file that uses them, otherwise it will go missing entirely and fail to link.

cppfuncs.hpp:getLinesFromFile → files.cpp:getLinesFromDataFile Also rewrite most of its implementation to provide useful errors when the file cannot be opened.

- Add the openUserFile function, analogous to openDataFile, which opens files containing user data, i.e. config, saves and scores. - Make the default location for user files $XDG_CONFIG_HOME/barony or $HOME/.config/barony if those variables are found. This should probably be replaced with behaviour more suitable for OSX ($HOME/Library/Application Support/barony?) and windows (%APPDATA%/barony?) - Add -userdir= option which allows overriding the aforementioned behaviour - Add setUserDir and setDataDir to the files module, so the knowledge of the static storage for these paths can be limited to files.cpp. Correspondingly, - Remove public datadir variable

Also sort them! Yay!

Move all openal/FMOD-specific functionality into src/sound_{fmod,openal}.cpp. Now everything else should depend on the common backend-agnostic interface provided in sound.hpp and the backend is determined purely by linkage.

lheckemann · 2017-09-24T11:32:16Z

Rebased, so it should merge cleanly now. I've also added some other niceties.

lheckemann · 2017-09-24T11:52:29Z

Also, shouldn't the header files have a header?

What?

and add -Werror=write-strings so they won't be reintroduced!

addictgamer · 2017-09-24T22:38:52Z

Also, shouldn't the header files have a header?
What?

E.g.:

/*-------------------------------------------------------------------------------

	BARONY
	File: stat.hpp
	Desc: header for stat.cpp (contains Stat class definition)

	Copyright 2013-2016 (c) Turning Wheel LLC, all rights reserved.
	See LICENSE for details.

-------------------------------------------------------------------------------*/

lheckemann · 2017-09-25T10:19:20Z

Aah, right. Will add.

lheckemann · 2017-09-25T10:26:15Z

Done!

addictgamer · 2017-09-26T04:43:50Z

Awesome. I'll pop open the Mac this weekend and do that last (hopefully) testing run, finally :)

lheckemann · 2017-09-26T06:08:05Z

I'll test it on a Mac too, probably before this weekend — just need to reinstall macOS on it which is a bit of a bootstrap problem, because apparently you can't make an installer USB without a macOS installation -_-

typo wasintroduced in f7d96cd

addictgamer · 2017-10-16T21:32:24Z

Change the "Working Directory" to $(SolutionDir)$(Configuration)\

Ah, good catch.

For myself, I'd have to get it building for a start :p

Oh? What's the issue?

lheckemann · 2017-10-16T21:33:32Z

Oh? What's the issue?

The usual when working OSX/Windows… not having a package manager to sort out all the dependencies for me.

This reverts commit c9d8248.

This allows fixing sound_null to enable the game (although it will be broken in a few ways, particularly when it comes to ranged weapons. These should probably rely on time values rather than sound effects.).

lheckemann · 2017-10-18T16:59:26Z

There, now this PR has a negative net lines-of-code balance and the game builds with sound_null :)

Still haven't built it on windows though.

addictgamer · 2017-10-20T03:30:18Z

When building the editor (with OpenAL):

CMakeFiles/editor.dir/src/files.cpp.o: In function `loadMap(char const*, map_t*, list_t*)':
/home/ciprian/programming/turning_wheel/barony_opensource/src/files.cpp:647: undefined reference to `levelmusicplaying'

addictgamer · 2017-10-20T03:35:53Z

Error also occurs with FMOD, but works fine with sound null.

This allows the editor to link successfully without having sound_common.cpp (which would introduce a dependency on net.cpp). This results in a little duplication — setting levelmusicplaying = false on every in-game map load — which is not ideal, but still IMHO better than making loadMap care so much about where it's called from. I hope to improve this more later on.

lheckemann · 2017-10-20T08:32:04Z

That should fix it.

lheckemann · 2017-10-26T21:55:08Z

Any further issues?

addictgamer · 2017-10-26T22:22:22Z

I will review it this weekend.

addictgamer · 2017-10-27T18:09:11Z

FMOD and sound_null build now. OpenAL should probably be changed to the default sound library instead of FMOD.

Will text under Windows and Mac later this weekend.

addictgamer · 2017-10-27T18:17:12Z

Found an issue with FMOD:

When I start up the game and enter a new level, the level music doesn't start playing. Rather, the main menu's music drops to very low volume and keeps playing.

Then when I back out to the main menu, the main menus music keeps playing (very quietly), although barely slightly louder.

Then when I try to start a new game again, the main menu music starts blasting back at full volume.

addictgamer · 2017-11-02T19:18:46Z

@lheckemann Have you had a chance to look into the FMOD issue?

lheckemann · 2017-11-02T19:23:08Z

Just got back from a trip to Munich for a conference so I haven't had the time. I should get around to it this weekend though. Very strange problem though, not sure how far I'll get especially considering how cooperative FMOD has been in the past :/

addictgamer · 2017-11-02T19:30:29Z

Ah, I see.

Thanks.

lheckemann · 2017-12-19T15:51:00Z

This has become pretty much unworkable. I'll split it into smaller changes and PR them separately eventually.

Dev editorhelpmenu

lheckemann added 14 commits September 24, 2017 10:56

Move inline item functions to header

cde87d6

Since they are inlined, their implementation needs to be included in every source file that uses them, otherwise it will go missing entirely and fail to link.

Move files.cpp's prototypes into their own header

3d0e21d

Move init.cpp's prototypes into their own header

f1fd44e

Move list.cpp's prototypes into their own header

a5c57e8

Move light.cpp's prototypes into their own header

cc2ffac

Move draw prototypes to their own header

8ac2b73

completePath → completeDataPath

ec9a0ef

Remove completeDataPath from public API of files

f4f277a

Reuse single RWops for font loading

d3044e8

Move getLinesFromFile

411d95f

cppfuncs.hpp:getLinesFromFile → files.cpp:getLinesFromDataFile Also rewrite most of its implementation to provide useful errors when the file cannot be opened.

Fix data file reference in editor

6be5878

Use C++ vector of strings for map names in editor

5685bbb

Also sort them! Yay!

Truly abstract over sound system

806eafa

Move all openal/FMOD-specific functionality into src/sound_{fmod,openal}.cpp. Now everything else should depend on the common backend-agnostic interface provided in sound.hpp and the backend is determined purely by linkage.

lheckemann force-pushed the barony-next-user-data branch from 227f30f to 806eafa Compare September 24, 2017 11:19

lheckemann added 2 commits September 24, 2017 17:00

Reduce duplication in CMakeLists flag setting

f7d96cd

Fix all uses of string literals as char*

06a26af

and add -Werror=write-strings so they won't be reintroduced!

Add preambles to new header files

4d4062e

Fix typo in CMakeLists.txt

4790f53

typo wasintroduced in f7d96cd

lheckemann mentioned this pull request Sep 27, 2017

Model cache #185

Closed

lheckemann added 6 commits October 18, 2017 17:40

Remove obsolete sound.cpp

df41f27

Remove unused SoundSystem type

c1bea0e

Revert "Fix FMOD file callbacks on windows (?)"

a0b96f7

This reverts commit c9d8248.

Move sound globals to sound_common

7acb145

Remove dead definitions from sound.hpp

cc64584

Move all sound init to init_game

662bed6

This allows fixing sound_null to enable the game (although it will be broken in a few ways, particularly when it comes to ranged weapons. These should probably rely on time values rather than sound effects.).

lheckemann force-pushed the barony-next-user-data branch from cc8c83b to 662bed6 Compare October 18, 2017 16:58

addictgamer added this to the Barony Next milestone Oct 20, 2017

addictgamer added the feature label Oct 20, 2017

This was referenced Oct 20, 2017

Fix Issue #173 - Fix Bow Sustained Firing #174

Open

[2.0.5][OpenAL] Bows/Slings do not fire consistently #173

Open

lheckemann mentioned this pull request Oct 20, 2017

Refactor GUI #177

Open

8 tasks

lheckemann closed this Dec 19, 2017

lheckemann mentioned this pull request Dec 29, 2017

Header split #297

Merged

addictgamer pushed a commit that referenced this pull request May 10, 2018

Merge pull request #86 from WALLOFJUSTICE/dev-editorhelpmenu

67a50d1

Dev editorhelpmenu

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Barony next user data #86

Barony next user data #86

lheckemann commented Jun 13, 2017

addictgamer commented Jul 3, 2017

lheckemann commented Jul 3, 2017

addictgamer commented Jul 4, 2017

lheckemann commented Sep 24, 2017

lheckemann commented Sep 24, 2017

addictgamer commented Sep 24, 2017

lheckemann commented Sep 25, 2017

lheckemann commented Sep 25, 2017

addictgamer commented Sep 26, 2017

lheckemann commented Sep 26, 2017 via email

addictgamer commented Oct 16, 2017

lheckemann commented Oct 16, 2017

lheckemann commented Oct 18, 2017

addictgamer commented Oct 20, 2017 •

edited

Loading

addictgamer commented Oct 20, 2017

lheckemann commented Oct 20, 2017

lheckemann commented Oct 26, 2017

addictgamer commented Oct 26, 2017

addictgamer commented Oct 27, 2017

addictgamer commented Oct 27, 2017

addictgamer commented Nov 2, 2017 •

edited

Loading

lheckemann commented Nov 2, 2017

addictgamer commented Nov 2, 2017 •

edited

Loading

lheckemann commented Dec 19, 2017

Barony next user data #86

Barony next user data #86

Conversation

lheckemann commented Jun 13, 2017

addictgamer commented Jul 3, 2017

lheckemann commented Jul 3, 2017

addictgamer commented Jul 4, 2017

lheckemann commented Sep 24, 2017

lheckemann commented Sep 24, 2017

addictgamer commented Sep 24, 2017

lheckemann commented Sep 25, 2017

lheckemann commented Sep 25, 2017

addictgamer commented Sep 26, 2017

lheckemann commented Sep 26, 2017 via email

addictgamer commented Oct 16, 2017

lheckemann commented Oct 16, 2017

lheckemann commented Oct 18, 2017

addictgamer commented Oct 20, 2017 • edited Loading

addictgamer commented Oct 20, 2017

lheckemann commented Oct 20, 2017

lheckemann commented Oct 26, 2017

addictgamer commented Oct 26, 2017

addictgamer commented Oct 27, 2017

addictgamer commented Oct 27, 2017

addictgamer commented Nov 2, 2017 • edited Loading

lheckemann commented Nov 2, 2017

addictgamer commented Nov 2, 2017 • edited Loading

lheckemann commented Dec 19, 2017

addictgamer commented Oct 20, 2017 •

edited

Loading

addictgamer commented Nov 2, 2017 •

edited

Loading

addictgamer commented Nov 2, 2017 •

edited

Loading