13189

pending completion

Build # 13189

Build Type

cron

travis-ci

Committed by

web-flow

Commit Message

Merge pull request #26752 from rainbowjose/livetodead

Renaming LivePeople to DeadPeople tileset

Run Details

31464 of 123279 relevant lines covered (25.52%)

103016.84 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

0.0

/src/ammo.h

#pragma once
#ifndef AMMO_H
#define AMMO_H

#include <string>

class JsonObject;

using itype_id = std::string;

class ammunition_type
{
        friend class DynamicDataLoader;
    public:
        ammunition_type() = default;
        explicit ammunition_type( std::string name ) : name_( std::move( name ) ) { }

        std::string name() const;

        itype_id const &default_ammotype() const {
            return default_ammotype_;
        }

    private:
        std::string name_;
        itype_id default_ammotype_;

        static void load_ammunition_type( JsonObject &jsobj );
        static void reset();
        static void check_consistency();
};

#endif

1	#pragma once
2	#ifndef AMMO_H
3	#define AMMO_H
4
5	#include <string>
6
7	class JsonObject;
8
9	using itype_id = std::string;
10
11	class ammunition_type
12	{
13	friend class DynamicDataLoader;
14	public:
15	ammunition_type() = default;
16	explicit ammunition_type( std::string name ) : name_( std::move( name ) ) { }
17
18	std::string name() const;
19
20	itype_id const &default_ammotype() const {
21	return default_ammotype_;	×
22	}
23
24	private:
25	std::string name_;
26	itype_id default_ammotype_;
27
28	static void load_ammunition_type( JsonObject &jsobj );
29	static void reset();
30	static void check_consistency();
31	};
32
33	#endif

CleverRaven / Cataclysm-DDA / 13189

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous